refactor shared logic into another helper

Author: Hweinstock

packages/core/src/shared/vscode/env.ts

@@ -68,13 +68,19 @@ export { extensionVersion }
  * @param throwWhen Throw if minimum vscode is equal or later than this version.
  */
 export function isMinVscode(throwWhen?: string): boolean {
-    const minVscode = getMinVscodeVersion()
-    if (throwWhen && semver.gte(minVscode, throwWhen)) {
-        throw Error(`Min vscode ${minVscode} >= ${throwWhen}. Delete or update the code that called this.`)
+    if (throwWhen) {
+        throwIfMinVscodeGte(throwWhen)
     }
     return vscode.version.startsWith(getMinVscodeVersion())
 }
 
+export function throwIfMinVscodeGte(targetVersion: string): void | never {
+    const minVscode = getMinVscodeVersion()
+    if (semver.gte(minVscode, targetVersion)) {
+        throw Error(`Min vscode ${minVscode} >= ${targetVersion}. Delete or update the code that called this.`)
+    }
+}
+
 /**
  * Returns the minimum vscode "engine" version declared in `package.json`.
  */

packages/core/src/test/testUtil.ts

@@ -20,6 +20,7 @@ import { mkdirSync, existsSync } from 'fs' // eslint-disable-line no-restricted-
 import { randomBytes } from 'crypto'
 import request from '../shared/request'
 import { stub } from 'sinon'
+import { throwIfMinVscodeGte } from '../shared/vscode/env'
 
 const testTempDirs: string[] = []
 
@@ -637,6 +638,7 @@ export function copyEnv(): NodeJS.ProcessEnv {
 }
 
 export function skipIfVscodeBelow(testContext: Mocha.Context, targetVersion: string) {
+    throwIfMinVscodeGte(targetVersion)
     if (semver.lt(vscode.version, targetVersion)) {
         testContext.skip()
     }