Skip to content

Commit 9e6d900

Browse files
refactor(amazonq): rename inline "genereating" message class
This new name more accurately represents what this class is for. It is just a util to create the "Amazon Q generating" inline message. Signed-off-by: nkomonen-amazon <[email protected]>
1 parent bbf7b0e commit 9e6d900

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

packages/amazonq/src/app/inline/completion.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {
3333
ImportAdderProvider,
3434
CodeSuggestionsState,
3535
} from 'aws-core-vscode/codewhisperer'
36-
import { ActiveStateTracker } from './stateTracker/activeStateTracker'
36+
import { InlineGeneratingMessage } from './inlineGeneratingMessage'
3737
import { LineTracker } from './stateTracker/lineTracker'
3838

3939
export class InlineCompletionManager implements Disposable {
@@ -43,14 +43,14 @@ export class InlineCompletionManager implements Disposable {
4343
private sessionManager: SessionManager
4444
private recommendationService: RecommendationService
4545
private lineTracker: LineTracker
46-
private activeStateTracker: ActiveStateTracker
46+
private activeStateTracker: InlineGeneratingMessage
4747
private readonly logSessionResultMessageName = 'aws/logInlineCompletionSessionResults'
4848

4949
constructor(languageClient: LanguageClient) {
5050
this.languageClient = languageClient
5151
this.sessionManager = new SessionManager()
5252
this.lineTracker = new LineTracker()
53-
this.activeStateTracker = new ActiveStateTracker(this.lineTracker)
53+
this.activeStateTracker = new InlineGeneratingMessage(this.lineTracker)
5454
this.recommendationService = new RecommendationService(this.sessionManager, this.activeStateTracker)
5555
this.inlineCompletionProvider = new AmazonQInlineCompletionItemProvider(
5656
languageClient,

packages/amazonq/src/app/inline/stateTracker/activeStateTracker.ts renamed to packages/amazonq/src/app/inline/inlineGeneratingMessage.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55

66
import { editorUtilities } from 'aws-core-vscode/shared'
77
import * as vscode from 'vscode'
8-
import { LineSelection, LineTracker } from './lineTracker'
8+
import { LineSelection, LineTracker } from './stateTracker/lineTracker'
99
import { AuthUtil } from 'aws-core-vscode/codewhisperer'
1010
import { cancellableDebounce } from 'aws-core-vscode/utils'
1111

12-
export class ActiveStateTracker implements vscode.Disposable {
12+
/**
13+
* Manages the inline ghost text message show when Inline Suggestions is "thinking".
14+
*/
15+
export class InlineGeneratingMessage implements vscode.Disposable {
1316
private readonly _disposable: vscode.Disposable
1417

1518
private readonly cwLineHintDecoration: vscode.TextEditorDecorationType =

packages/amazonq/src/app/inline/recommendationService.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import {
1111
import { CancellationToken, InlineCompletionContext, Position, TextDocument } from 'vscode'
1212
import { LanguageClient } from 'vscode-languageclient'
1313
import { SessionManager } from './sessionManager'
14-
import { ActiveStateTracker } from './stateTracker/activeStateTracker'
14+
import { InlineGeneratingMessage } from './inlineGeneratingMessage'
1515

1616
export class RecommendationService {
1717
constructor(
1818
private readonly sessionManager: SessionManager,
19-
private readonly activeStateTracker: ActiveStateTracker
19+
private readonly inlineGeneratingMessage: InlineGeneratingMessage
2020
) {}
2121

2222
async getAllRecommendations(
@@ -35,7 +35,7 @@ export class RecommendationService {
3535
}
3636
const requestStartTime = Date.now()
3737

38-
await this.activeStateTracker.showGenerating(context.triggerKind)
38+
await this.inlineGeneratingMessage.showGenerating(context.triggerKind)
3939

4040
// Handle first request
4141
const firstResult: InlineCompletionListWithReferences = await languageClient.sendRequest(
@@ -61,7 +61,7 @@ export class RecommendationService {
6161
this.sessionManager.closeSession()
6262
}
6363

64-
this.activeStateTracker.hideGenerating()
64+
this.inlineGeneratingMessage.hideGenerating()
6565
}
6666

6767
private async processRemainingRequests(

packages/amazonq/test/unit/amazonq/apps/inline/completion.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
ReferenceInlineProvider,
1616
ReferenceLogViewProvider,
1717
} from 'aws-core-vscode/codewhisperer'
18-
import { ActiveStateTracker } from '../../../../../src/app/inline/stateTracker/activeStateTracker'
18+
import { InlineGeneratingMessage } from '../../../../../src/app/inline/inlineGeneratingMessage'
1919
import { LineTracker } from '../../../../../src/app/inline/stateTracker/lineTracker'
2020

2121
describe('InlineCompletionManager', () => {
@@ -267,7 +267,7 @@ describe('InlineCompletionManager', () => {
267267

268268
beforeEach(() => {
269269
const lineTracker = new LineTracker()
270-
const activeStateController = new ActiveStateTracker(lineTracker)
270+
const activeStateController = new InlineGeneratingMessage(lineTracker)
271271
recommendationService = new RecommendationService(mockSessionManager, activeStateController)
272272
setInlineReferenceStub = sandbox.stub(ReferenceInlineProvider.instance, 'setInlineReference')
273273

packages/amazonq/test/unit/amazonq/apps/inline/recommendationService.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { RecommendationService } from '../../../../../src/app/inline/recommendat
1111
import { SessionManager } from '../../../../../src/app/inline/sessionManager'
1212
import { createMockDocument } from 'aws-core-vscode/test'
1313
import { LineTracker } from '../../../../../src/app/inline/stateTracker/lineTracker'
14-
import { ActiveStateTracker } from '../../../../../src/app/inline/stateTracker/activeStateTracker'
14+
import { InlineGeneratingMessage } from '../../../../../src/app/inline/inlineGeneratingMessage'
1515

1616
describe('RecommendationService', () => {
1717
let languageClient: LanguageClient
@@ -31,7 +31,7 @@ describe('RecommendationService', () => {
3131
const mockPartialResultToken = 'some-random-token'
3232
const sessionManager = new SessionManager()
3333
const lineTracker = new LineTracker()
34-
const activeStateController = new ActiveStateTracker(lineTracker)
34+
const activeStateController = new InlineGeneratingMessage(lineTracker)
3535
const service = new RecommendationService(sessionManager, activeStateController)
3636

3737
beforeEach(() => {

0 commit comments

Comments
 (0)