Skip to content

Commit 1f6b7f7

Browse files
authored
chore(amazonq): refactor inline completion codes (#2367)
1 parent 9f2f306 commit 1f6b7f7

18 files changed

+213
-465
lines changed

server/aws-lsp-codewhisperer/src/language-server/chat/telemetry/chatTelemetryController.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { ToolUse, UserIntent } from '@amzn/codewhisperer-streaming'
2020
import { TriggerContext } from '../contexts/triggerContext'
2121

2222
import { CredentialsProvider, Logging } from '@aws/language-server-runtimes/server-interface'
23-
import { AcceptedSuggestionEntry, CodeDiffTracker } from '../../inline-completion/codeDiffTracker'
23+
import { AcceptedSuggestionEntry, CodeDiffTracker } from '../../inline-completion/tracker/codeDiffTracker'
2424
import { TelemetryService } from '../../../shared/telemetry/telemetryService'
2525
import { getEndPositionForAcceptedSuggestion, getTelemetryReasonDesc } from '../../../shared/utils'
2626
import { CodewhispererLanguage } from '../../../shared/languageDetection'

server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import {
5252
SPECIAL_CHARACTER_HELLO_WORLD,
5353
stubCodeWhispererService,
5454
} from '../../shared/testUtils'
55-
import { CodeDiffTracker } from './codeDiffTracker'
55+
import { CodeDiffTracker } from './tracker/codeDiffTracker'
5656
import { TelemetryService } from '../../shared/telemetry/telemetryService'
5757
import { initBaseTestServiceManager, TestAmazonQServiceManager } from '../../shared/amazonQServiceManager/testUtils'
5858
import * as utils from '../../shared/utils'
@@ -61,7 +61,7 @@ import { URI } from 'vscode-uri'
6161
import { INVALID_TOKEN } from '../../shared/constants'
6262
import { AmazonQError } from '../../shared/amazonQServiceManager/errors'
6363
import * as path from 'path'
64-
import { CONTEXT_CHARACTERS_LIMIT } from './constants'
64+
import { CONTEXT_CHARACTERS_LIMIT } from './contants/constants'
6565
import { IdleWorkspaceManager } from '../workspaceContext/IdleWorkspaceManager'
6666

6767
const updateConfiguration = async (

server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ import {
2626
SuggestionType,
2727
} from '../../shared/codeWhispererService'
2828
import { CodewhispererLanguage, getSupportedLanguageId } from '../../shared/languageDetection'
29-
import { truncateOverlapWithRightContext } from './mergeRightUtils'
29+
import { truncateOverlapWithRightContext } from './utils/mergeRightUtils'
3030
import { CodeWhispererSession, SessionManager } from './session/sessionManager'
31-
import { CodePercentageTracker } from './codePercentage'
31+
import { CodePercentageTracker } from './tracker/codePercentageTracker'
3232
import { getCompletionType, getEndPositionForAcceptedSuggestion, getErrorMessage, safeGet } from '../../shared/utils'
3333
import { getIdeCategory, makeUserContextObject } from '../../shared/telemetryUtils'
3434
import { textUtils } from '@aws/lsp-core'
3535
import { TelemetryService } from '../../shared/telemetry/telemetryService'
36-
import { AcceptedInlineSuggestionEntry, CodeDiffTracker } from './codeDiffTracker'
36+
import { AcceptedInlineSuggestionEntry, CodeDiffTracker } from './tracker/codeDiffTracker'
3737
import {
3838
AmazonQError,
3939
AmazonQServiceConnectionExpiredError,
@@ -50,16 +50,16 @@ import { RecentEditTracker, RecentEditTrackerDefaultConfig } from './tracker/cod
5050
import { CursorTracker } from './tracker/cursorTracker'
5151
import { RejectedEditTracker, DEFAULT_REJECTED_EDIT_TRACKER_CONFIG } from './tracker/rejectedEditTracker'
5252
import { StreakTracker } from './tracker/streakTracker'
53-
import { getAddedAndDeletedLines, getCharacterDifferences } from './diffUtils'
53+
import { getAddedAndDeletedLines, getCharacterDifferences } from './utils/diffUtils'
5454
import {
5555
emitPerceivedLatencyTelemetry,
5656
emitServiceInvocationFailure,
5757
emitServiceInvocationTelemetry,
5858
emitUserTriggerDecisionTelemetry,
59-
} from './telemetry'
59+
} from './telemetry/telemetry'
6060
import { DocumentChangedListener } from './documentChangedListener'
6161
import { EditCompletionHandler } from './editCompletionHandler'
62-
import { EMPTY_RESULT, ABAP_EXTENSIONS } from './constants'
62+
import { EMPTY_RESULT, ABAP_EXTENSIONS } from './contants/constants'
6363
import { IdleWorkspaceManager } from '../workspaceContext/IdleWorkspaceManager'
6464
import { URI } from 'vscode-uri'
6565
import { isUsingIAMAuth } from '../../shared/utils'

server/aws-lsp-codewhisperer/src/language-server/inline-completion/editCompletionHandler.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ import {
2828
emitServiceInvocationFailure,
2929
emitServiceInvocationTelemetry,
3030
emitUserTriggerDecisionTelemetry,
31-
} from './telemetry'
31+
} from './telemetry/telemetry'
3232
import { TelemetryService } from '../../shared/telemetry/telemetryService'
3333
import { textUtils } from '@aws/lsp-core'
3434
import { AmazonQBaseServiceManager } from '../../shared/amazonQServiceManager/BaseAmazonQServiceManager'
3535
import { RejectedEditTracker } from './tracker/rejectedEditTracker'
3636
import { getErrorMessage, hasConnectionExpired } from '../../shared/utils'
3737
import { AmazonQError, AmazonQServiceConnectionExpiredError } from '../../shared/amazonQServiceManager/errors'
3838
import { DocumentChangedListener } from './documentChangedListener'
39-
import { EMPTY_RESULT, EDIT_DEBOUNCE_INTERVAL_MS } from './constants'
39+
import { EMPTY_RESULT, EDIT_DEBOUNCE_INTERVAL_MS } from './contants/constants'
4040
import { StreakTracker } from './tracker/streakTracker'
4141

4242
export class EditCompletionHandler {

server/aws-lsp-codewhisperer/src/language-server/inline-completion/mergeRightUtils.test.ts

Lines changed: 0 additions & 270 deletions
This file was deleted.

0 commit comments

Comments
 (0)