use dict version of isMinVscode

Author: Hweinstock

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

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

packages/core/src/test/applicationcomposer/messageHandlers/generateResourceHandler.test.ts

@@ -8,11 +8,13 @@ import sinon from 'sinon'
 import { createTemplate, createWebviewContext } from '../utils'
 import { generateResourceHandler } from '../../../applicationcomposer/messageHandlers/generateResourceHandler'
 import { Command, MessageType } from '../../../applicationcomposer/types'
-import { skipIfVscodeBelow } from '../../testUtil'
+import { isMinVscode } from '../../../shared/vscode/env'
 
 describe('generateResourceHandler', function () {
     it('amazon q is not installed', async function () {
-        skipIfVscodeBelow(this, '1.89.0')
+        if (isMinVscode({ throwWhen: '1.89.0' })) {
+            this.skip()
+        }
         const panel = await createTemplate()
         const postMessageSpy = sinon.spy(panel.webview, 'postMessage')
         const context = await createWebviewContext({

packages/core/src/test/applicationcomposer/messageHandlers/initMessageHandler.test.ts

@@ -7,15 +7,17 @@ import assert from 'assert'
 import sinon from 'sinon'
 import { initMessageHandler } from '../../../applicationcomposer/messageHandlers/initMessageHandler'
 import { createTemplate, createWebviewContext } from '../utils'
-import { skipIfVscodeBelow } from '../../testUtil'
+import { isMinVscode } from '../../../shared/vscode/env'
 
 describe('initMessageHandler', function () {
     afterEach(function () {
         sinon.restore()
     })
 
     it('not connected to codewhisperer', async function () {
-        skipIfVscodeBelow(this, '1.89.0')
+        if (isMinVscode({ throwWhen: '1.89.0' })) {
+            this.skip()
+        }
         const panel = await createTemplate()
         const postMessageSpy = sinon.spy(panel.webview, 'postMessage')
         const context = await createWebviewContext({

packages/core/src/test/testUtil.ts

@@ -6,7 +6,6 @@
 import assert from 'assert'
 import * as path from 'path'
 import * as vscode from 'vscode'
-import * as semver from 'semver'
 import * as FakeTimers from '@sinonjs/fake-timers'
 import * as pathutil from '../shared/utilities/pathUtils'
 import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../shared/filesystemUtilities'
@@ -20,7 +19,6 @@ 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[] = []
 
@@ -636,10 +634,3 @@ export function getFetchStubWithResponse(response: Partial<Response>) {
 export function copyEnv(): NodeJS.ProcessEnv {
     return { ...process.env }
 }
-
-export function skipIfVscodeBelow(testContext: Mocha.Context, targetVersion: string) {
-    throwIfMinVscodeGte(targetVersion)
-    if (semver.lt(vscode.version, targetVersion)) {
-        testContext.skip()
-    }
-}