(refactor codewhisperer): refactor 1, move supplemental context pojos to model file (#4029)

Author: Will-ShaoHua

src/codewhisperer/models/model.ts

@@ -39,6 +39,27 @@ export const vsCodeState: VsCodeState = {
     lastUserModificationTime: 0,
 }
 
+export type UtgStrategy = 'ByName' | 'ByContent'
+
+export type CrossFileStrategy = 'OpenTabs_BM25'
+
+export type SupplementalContextStrategy = CrossFileStrategy | UtgStrategy | 'Empty'
+
+export interface CodeWhispererSupplementalContext {
+    isUtg: boolean
+    isProcessTimeout: boolean
+    supplementalContextItems: CodeWhispererSupplementalContextItem[]
+    contentsLength: number
+    latency: number
+    strategy: SupplementalContextStrategy
+}
+
+export interface CodeWhispererSupplementalContextItem {
+    content: string
+    filePath: string
+    score?: number
+}
+
 // This response struct can contain more info as needed
 export interface GetRecommendationsResponse {
     readonly result: 'Succeeded' | 'Failed'

src/codewhisperer/util/codeWhispererSession.ts

@@ -10,7 +10,7 @@ import {
 } from '../../shared/telemetry/telemetry.gen'
 import { GenerateRecommendationsRequest, ListRecommendationsRequest, Recommendation } from '../client/codewhisperer'
 import { Position } from 'vscode'
-import { CodeWhispererSupplementalContext } from './supplementalContext/supplementalContextUtil'
+import { CodeWhispererSupplementalContext } from '../models/model'
 
 const performance = globalThis.performance ?? require('perf_hooks').performance
 

src/codewhisperer/util/editorContext.ts

@@ -11,13 +11,11 @@ import { getTabSizeSetting } from '../../shared/utilities/editorUtilities'
 import { TelemetryHelper } from './telemetryHelper'
 import { getLogger } from '../../shared/logger/logger'
 import { runtimeLanguageContext } from './runtimeLanguageContext'
-import {
-    CodeWhispererSupplementalContext,
-    fetchSupplementalContext,
-} from './supplementalContext/supplementalContextUtil'
+import { fetchSupplementalContext } from './supplementalContext/supplementalContextUtil'
 import { supplementalContextTimeoutInMs } from '../models/constants'
 import { getSelectedCustomization } from './customizationUtil'
 import { selectFrom } from '../../shared/utilities/tsUtils'
+import { CodeWhispererSupplementalContext } from '../models/model'
 
 let tabSize: number = getTabSizeSetting()
 

src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts

@@ -10,14 +10,12 @@ import { BM25Document, BM25Okapi } from './rankBm25'
 import { ToolkitError } from '../../../shared/errors'
 import { UserGroup, crossFileContextConfig, supplemetalContextFetchingTimeoutMsg } from '../../models/constants'
 import { CancellationError } from '../../../shared/utilities/timeoutUtils'
-import { CodeWhispererSupplementalContext, CodeWhispererSupplementalContextItem } from './supplementalContextUtil'
 import { CodeWhispererUserGroupSettings } from '../userGroupUtil'
 import { isTestFile } from './codeParsingUtil'
 import { getFileDistance } from '../../../shared/filesystemUtilities'
 import { getOpenFilesInWindow } from '../../../shared/utilities/editorUtilities'
 import { getLogger } from '../../../shared/logger/logger'
-
-export type CrossFileStrategy = 'OpenTabs_BM25'
+import { CodeWhispererSupplementalContext, CodeWhispererSupplementalContextItem } from '../../models/model'
 
 type CrossFileSupportedLanguage =
     | 'java'

src/codewhisperer/util/supplementalContext/supplementalContextUtil.ts

@@ -3,34 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { UtgStrategy, fetchSupplementalContextForTest } from './utgUtils'
-import { CrossFileStrategy, fetchSupplementalContextForSrc } from './crossFileContextUtil'
+import { fetchSupplementalContextForTest } from './utgUtils'
+import { fetchSupplementalContextForSrc } from './crossFileContextUtil'
 import { isTestFile } from './codeParsingUtil'
 import { DependencyGraphFactory } from '../dependencyGraph/dependencyGraphFactory'
 import * as vscode from 'vscode'
 import { CancellationError } from '../../../shared/utilities/timeoutUtils'
 import { ToolkitError } from '../../../shared/errors'
 import { getLogger } from '../../../shared/logger/logger'
+import { CodeWhispererSupplementalContext } from '../../models/model'
 
 const performance = globalThis.performance ?? require('perf_hooks').performance
 
-export type SupplementalContextStrategy = CrossFileStrategy | UtgStrategy | 'Empty'
-
-export interface CodeWhispererSupplementalContext {
-    isUtg: boolean
-    isProcessTimeout: boolean
-    supplementalContextItems: CodeWhispererSupplementalContextItem[]
-    contentsLength: number
-    latency: number
-    strategy: SupplementalContextStrategy
-}
-
-export interface CodeWhispererSupplementalContextItem {
-    content: string
-    filePath: string
-    score?: number
-}
-
 export async function fetchSupplementalContext(
     editor: vscode.TextEditor,
     cancellationToken: vscode.CancellationToken

src/codewhisperer/util/supplementalContext/utgUtils.ts

@@ -18,17 +18,15 @@ import {
 import { ToolkitError } from '../../../shared/errors'
 import { supplemetalContextFetchingTimeoutMsg } from '../../models/constants'
 import { CancellationError } from '../../../shared/utilities/timeoutUtils'
-import { CodeWhispererSupplementalContext, CodeWhispererSupplementalContextItem } from './supplementalContextUtil'
 import { utgConfig } from '../../models/constants'
 import { CodeWhispererUserGroupSettings } from '../userGroupUtil'
 import { UserGroup } from '../../models/constants'
 import { getOpenFilesInWindow } from '../../../shared/utilities/editorUtilities'
 import { getLogger } from '../../../shared/logger/logger'
+import { CodeWhispererSupplementalContext, CodeWhispererSupplementalContextItem, UtgStrategy } from '../../models/model'
 
 type UtgSupportedLanguage = keyof typeof utgLanguageConfigs
 
-export type UtgStrategy = 'ByName' | 'ByContent'
-
 function isUtgSupportedLanguage(languageId: vscode.TextDocument['languageId']): languageId is UtgSupportedLanguage {
     return languageId in utgLanguageConfigs
 }

src/codewhisperer/util/telemetryHelper.ts

@@ -25,12 +25,12 @@ import {
 import { getImportCount } from './importAdderUtil'
 import { CodeWhispererSettings } from './codewhispererSettings'
 import { CodeWhispererUserGroupSettings } from './userGroupUtil'
-import { CodeWhispererSupplementalContext } from './supplementalContext/supplementalContextUtil'
 import { getSelectedCustomization } from './customizationUtil'
 import { AuthUtil } from './authUtil'
 import { isAwsError } from '../../shared/errors'
 import { getLogger } from '../../shared/logger'
 import { session } from './codeWhispererSession'
+import { CodeWhispererSupplementalContext } from '../models/model'
 
 const performance = globalThis.performance ?? require('perf_hooks').performance