Merge master into feature/sdkv3

Author: aws-toolkit-automation

.eslintrc.js

@@ -180,6 +180,7 @@ module.exports = {
         'aws-toolkits/no-console-log': 'error',
         'aws-toolkits/no-json-stringify-in-log': 'error',
         'aws-toolkits/no-printf-mismatch': 'error',
+        'aws-toolkits/no-index-import': 'error',
         'no-restricted-imports': [
             'error',
             {

packages/core/src/amazonq/commons/connector/baseMessenger.ts

@@ -5,7 +5,6 @@
 
 import { ChatItemAction, ProgressField } from '@aws/mynah-ui'
 import { AuthFollowUpType, AuthMessageDataMap } from '../../../amazonq/auth/model'
-import { FeatureAuthState } from '../../../codewhisperer'
 import { i18n } from '../../../shared/i18n-helper'
 import { CodeReference } from '../../../amazonq/webview/ui/connector'
 
@@ -28,6 +27,7 @@ import {
 import { FollowUpTypes } from '../types'
 import { messageWithConversationId } from '../../../amazonqFeatureDev/userFacingText'
 import { DeletedFileInfo, NewFileInfo } from '../../../amazonqFeatureDev/types'
+import { FeatureAuthState } from '../../../codewhisperer/util/authUtil'
 
 export class Messenger {
     public constructor(

packages/core/src/amazonq/commons/controllers/contentController.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode'
 import path from 'path'
 import { Position, TextEditor, window } from 'vscode'
-import { getLogger } from '../../../shared/logger'
+import { getLogger } from '../../../shared/logger/logger'
 import { amazonQDiffScheme, amazonQTabSuffix } from '../../../shared/constants'
 import { disposeOnEditorClose } from '../../../shared/utilities/editorUtilities'
 import {
@@ -15,7 +15,9 @@ import {
     getIndentedCode,
     getSelectionFromRange,
 } from '../../../shared/utilities/textDocumentUtilities'
-import { extractFileAndCodeSelectionFromMessage, fs, getErrorMsg, ToolkitError } from '../../../shared'
+import { ToolkitError, getErrorMsg } from '../../../shared/errors'
+import fs from '../../../shared/fs/fs'
+import { extractFileAndCodeSelectionFromMessage } from '../../../shared/utilities/textUtilities'
 import { UserWrittenCodeTracker } from '../../../codewhisperer/tracker/userWrittenCodeTracker'
 
 export class ContentProvider implements vscode.TextDocumentContentProvider {

packages/core/src/amazonq/commons/diff.ts

@@ -4,7 +4,7 @@
  */
 
 import * as vscode from 'vscode'
-import { fs } from '../../shared'
+import { fs } from '../../shared/fs/fs'
 import { diffLines } from 'diff'
 
 export async function openDiff(leftPath: string, rightPath: string, tabId: string, scheme: string) {

packages/core/src/amazonq/commons/session/sessionConfigFactory.ts

@@ -5,8 +5,9 @@
 
 import * as vscode from 'vscode'
 import { WorkspaceFolderNotFoundError } from '../../../amazonqFeatureDev/errors'
-import { VirtualFileSystem, VirtualMemoryFile } from '../../../shared'
 import { CurrentWsFolders } from '../../../amazonqFeatureDev/types'
+import { VirtualFileSystem } from '../../../shared/virtualFilesystem'
+import { VirtualMemoryFile } from '../../../shared/virtualMemoryFile'
 
 export interface SessionConfig {
     // The paths on disk to where the source code lives

packages/core/src/amazonq/explorer/amazonQChildrenNodes.ts

@@ -11,8 +11,10 @@ import { installAmazonQExtension } from '../../codewhisperer/commands/basicComma
 import { amazonQHelpUrl } from '../../shared/constants'
 import { cwTreeNodeSource } from '../../codewhisperer/commands/types'
 import { VSCODE_EXTENSION_ID } from '../../shared/extensions'
-import { globals, setContext } from '../../shared'
-import { ExtStartUpSources, telemetry } from '../../shared/telemetry'
+import globals from '../../shared/extensionGlobals'
+import { setContext } from '../../shared/vscode/setContext'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { ExtStartUpSources } from '../../shared/telemetry/util'
 import { ExtensionUse } from '../../auth/utils'
 
 const localize = nls.loadMessageBundle()

packages/core/src/amazonq/extApi.ts

@@ -4,11 +4,11 @@
  */
 
 import vscode from 'vscode'
-import { VSCODE_EXTENSION_ID } from '../shared/utilities'
+import { VSCODE_EXTENSION_ID } from '../shared/extensions'
 import { SendMessageCommandOutput, SendMessageRequest } from '@amzn/amazon-q-developer-streaming-client'
 import { GenerateAssistantResponseCommandOutput, GenerateAssistantResponseRequest } from '@amzn/codewhisperer-streaming'
 import { FeatureAuthState } from '../codewhisperer/util/authUtil'
-import { ToolkitError } from '../shared'
+import { ToolkitError } from '../shared/errors'
 
 /**
  * This interface is used and exported by the amazon q extension. If you make a change here then

packages/core/src/amazonq/index.ts

@@ -43,7 +43,7 @@ export { ExtensionMessage } from '../amazonq/webview/ui/commands'
 export { CodeReference } from '../codewhispererChat/view/connector/connector'
 export { extractAuthFollowUp } from './util/authUtils'
 export { Messenger } from './commons/connector/baseMessenger'
-import { FeatureContext } from '../shared'
+import { FeatureContext } from '../shared/featureConfig'
 
 /**
  * main from createMynahUI is a purely browser dependency. Due to this

packages/core/src/amazonq/lsp/lspClient.ts

@@ -32,7 +32,9 @@ import {
 } from './types'
 import { Writable } from 'stream'
 import { CodeWhispererSettings } from '../../codewhisperer/util/codewhispererSettings'
-import { fs, getLogger, globals } from '../../shared'
+import { fs } from '../../shared/fs/fs'
+import { getLogger } from '../../shared/logger/logger'
+import globals from '../../shared/extensionGlobals'
 
 const localize = nls.loadMessageBundle()
 

packages/core/src/amazonq/lsp/lspController.ts

@@ -16,9 +16,11 @@ import AdmZip from 'adm-zip'
 import { RelevantTextDocument } from '@amzn/codewhisperer-streaming'
 import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../shared/filesystemUtilities'
 import { activate as activateLsp } from './lspClient'
-import { telemetry } from '../../shared/telemetry'
+import { telemetry } from '../../shared/telemetry/telemetry'
 import { isCloud9 } from '../../shared/extensionUtilities'
-import { fs, globals, ToolkitError } from '../../shared'
+import { fs } from '../../shared/fs/fs'
+import globals from '../../shared/extensionGlobals'
+import { ToolkitError } from '../../shared/errors'
 import { isWeb } from '../../shared/extensionGlobals'
 import { getUserAgent } from '../../shared/telemetry/util'
 import { isAmazonInternalOs } from '../../shared/vscode/env'