@aws/lsp-codewhisperer 0.0.28 → 0.0.29
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +26 -0
- package/README.md +3 -0
- package/out/client/token/codewhisperer.d.ts +1 -1
- package/out/constants.d.ts +3 -0
- package/out/constants.js +4 -1
- package/out/constants.js.map +1 -1
- package/out/language-server/amazonQServiceManager/AmazonQTokenServiceManager.d.ts +90 -0
- package/out/language-server/amazonQServiceManager/AmazonQTokenServiceManager.js +466 -0
- package/out/language-server/amazonQServiceManager/AmazonQTokenServiceManager.js.map +1 -0
- package/out/language-server/amazonQServiceManager/BaseAmazonQServiceManager.d.ts +5 -0
- package/out/language-server/amazonQServiceManager/BaseAmazonQServiceManager.js +3 -0
- package/out/language-server/amazonQServiceManager/BaseAmazonQServiceManager.js.map +1 -0
- package/out/language-server/amazonQServiceManager/errors.d.ts +28 -0
- package/out/language-server/amazonQServiceManager/errors.js +70 -0
- package/out/language-server/amazonQServiceManager/errors.js.map +1 -0
- package/out/language-server/amazonQServiceManager/qDeveloperProfiles.js +7 -7
- package/out/language-server/amazonQServiceManager/qDeveloperProfiles.js.map +1 -1
- package/out/language-server/chat/chatController.d.ts +1 -1
- package/out/language-server/chat/chatController.js +17 -1
- package/out/language-server/chat/chatController.js.map +1 -1
- package/out/language-server/chat/chatSessionManagementService.d.ts +3 -8
- package/out/language-server/chat/chatSessionManagementService.js +5 -57
- package/out/language-server/chat/chatSessionManagementService.js.map +1 -1
- package/out/language-server/chat/chatSessionService.d.ts +2 -3
- package/out/language-server/chat/chatSessionService.js +7 -21
- package/out/language-server/chat/chatSessionService.js.map +1 -1
- package/out/language-server/chat/contexts/triggerContext.d.ts +1 -1
- package/out/language-server/chat/contexts/triggerContext.js +2 -1
- package/out/language-server/chat/contexts/triggerContext.js.map +1 -1
- package/out/language-server/chat/telemetry/chatTelemetryController.js +88 -81
- package/out/language-server/chat/telemetry/chatTelemetryController.js.map +1 -1
- package/out/language-server/codeWhispererSecurityScanServer.d.ts +2 -4
- package/out/language-server/codeWhispererSecurityScanServer.js +24 -11
- package/out/language-server/codeWhispererSecurityScanServer.js.map +1 -1
- package/out/language-server/codeWhispererServer.js +90 -37
- package/out/language-server/codeWhispererServer.js.map +1 -1
- package/out/language-server/codeWhispererService.d.ts +8 -1
- package/out/language-server/codeWhispererService.js +39 -16
- package/out/language-server/codeWhispererService.js.map +1 -1
- package/out/language-server/configuration/qConfigurationServer.d.ts +5 -9
- package/out/language-server/configuration/qConfigurationServer.js +23 -35
- package/out/language-server/configuration/qConfigurationServer.js.map +1 -1
- package/out/language-server/netTransformServer.js +2 -2
- package/out/language-server/netTransformServer.js.map +1 -1
- package/out/language-server/proxy-server.js +3 -14
- package/out/language-server/proxy-server.js.map +1 -1
- package/out/language-server/qChatServer.d.ts +2 -4
- package/out/language-server/qChatServer.js +30 -16
- package/out/language-server/qChatServer.js.map +1 -1
- package/out/language-server/securityScan/constants.d.ts +3 -0
- package/out/language-server/securityScan/constants.js +7 -0
- package/out/language-server/securityScan/constants.js.map +1 -0
- package/out/language-server/securityScan/securityScanHandler.d.ts +5 -5
- package/out/language-server/securityScan/securityScanHandler.js +22 -12
- package/out/language-server/securityScan/securityScanHandler.js.map +1 -1
- package/out/language-server/telemetry/codeDiffTracker.d.ts +1 -1
- package/out/language-server/telemetry/codeDiffTracker.js +1 -1
- package/out/language-server/telemetry/codeDiffTracker.js.map +1 -1
- package/out/language-server/telemetryService.d.ts +7 -5
- package/out/language-server/telemetryService.js +29 -20
- package/out/language-server/telemetryService.js.map +1 -1
- package/out/language-server/testUtils.d.ts +3 -0
- package/out/language-server/testUtils.js +12 -1
- package/out/language-server/testUtils.js.map +1 -1
- package/out/language-server/utils.d.ts +2 -0
- package/out/language-server/utils.js +11 -0
- package/out/language-server/utils.js.map +1 -1
- package/package.json +3 -3
|
@@ -2,23 +2,22 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.QChatServer = void 0;
|
|
4
4
|
const chatController_1 = require("./chat/chatController");
|
|
5
|
+
const chatSessionManagementService_1 = require("./chat/chatSessionManagementService");
|
|
5
6
|
const quickActions_1 = require("./chat/quickActions");
|
|
6
7
|
const telemetryService_1 = require("./telemetryService");
|
|
7
8
|
const telemetryUtils_1 = require("./utilities/telemetryUtils");
|
|
8
|
-
const
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
const
|
|
15
|
-
|
|
9
|
+
const AmazonQTokenServiceManager_1 = require("./amazonQServiceManager/AmazonQTokenServiceManager");
|
|
10
|
+
const errors_1 = require("./amazonQServiceManager/errors");
|
|
11
|
+
const utils_1 = require("./utils");
|
|
12
|
+
const QChatServer =
|
|
13
|
+
// prettier-ignore
|
|
14
|
+
() => features => {
|
|
15
|
+
const { chat, credentialsProvider, telemetry, logging, lsp, runtime } = features;
|
|
16
|
+
let amazonQServiceManager;
|
|
17
|
+
let chatController;
|
|
18
|
+
let chatSessionManagementService;
|
|
19
|
+
let telemetryService;
|
|
16
20
|
lsp.addInitializer((params) => {
|
|
17
|
-
chatSessionManagementService.setCustomUserAgent((0, telemetryUtils_1.getUserAgent)(params, runtime.serverInfo));
|
|
18
|
-
telemetryService.updateClientConfig({
|
|
19
|
-
customUserAgent: (0, telemetryUtils_1.getUserAgent)(params, runtime.serverInfo),
|
|
20
|
-
});
|
|
21
|
-
telemetryService.updateUserContext((0, telemetryUtils_1.makeUserContextObject)(params, runtime.platform, 'CHAT'));
|
|
22
21
|
return {
|
|
23
22
|
capabilities: {},
|
|
24
23
|
awsServerCapabilities: {
|
|
@@ -34,6 +33,23 @@ const QChatServer = (service) => features => {
|
|
|
34
33
|
},
|
|
35
34
|
};
|
|
36
35
|
});
|
|
36
|
+
const updateConfigurationHandler = async () => {
|
|
37
|
+
await amazonQServiceManager.handleDidChangeConfiguration();
|
|
38
|
+
await chatController.updateConfiguration();
|
|
39
|
+
};
|
|
40
|
+
lsp.onInitialized(async () => {
|
|
41
|
+
// Initialize service manager and inject it to chatSessionManagementService to pass it down
|
|
42
|
+
amazonQServiceManager = AmazonQTokenServiceManager_1.AmazonQTokenServiceManager.getInstance(features);
|
|
43
|
+
chatSessionManagementService = chatSessionManagementService_1.ChatSessionManagementService
|
|
44
|
+
.getInstance()
|
|
45
|
+
.withAmazonQServiceManager(amazonQServiceManager);
|
|
46
|
+
telemetryService = new telemetryService_1.TelemetryService(amazonQServiceManager, credentialsProvider, telemetry, logging);
|
|
47
|
+
const clientParams = (0, utils_1.safeGet)(lsp.getClientInitializeParams(), new errors_1.AmazonQServiceInitializationError('TelemetryService initialized before LSP connection was initialized.'));
|
|
48
|
+
telemetryService.updateUserContext((0, telemetryUtils_1.makeUserContextObject)(clientParams, runtime.platform, 'CHAT'));
|
|
49
|
+
chatController = new chatController_1.ChatController(chatSessionManagementService, features, telemetryService);
|
|
50
|
+
await updateConfigurationHandler();
|
|
51
|
+
});
|
|
52
|
+
lsp.didChangeConfiguration(updateConfigurationHandler);
|
|
37
53
|
chat.onTabAdd(params => {
|
|
38
54
|
logging.log(`Adding tab: ${params.tabId}`);
|
|
39
55
|
return chatController.onTabAdd(params);
|
|
@@ -63,11 +79,9 @@ const QChatServer = (service) => features => {
|
|
|
63
79
|
chat.onCodeInsertToCursorPosition(params => {
|
|
64
80
|
return chatController.onCodeInsertToCursorPosition(params);
|
|
65
81
|
});
|
|
66
|
-
lsp.onInitialized(chatController.updateConfiguration);
|
|
67
|
-
lsp.didChangeConfiguration(chatController.updateConfiguration);
|
|
68
82
|
logging.log('Q Chat server has been initialized');
|
|
69
83
|
return () => {
|
|
70
|
-
chatController
|
|
84
|
+
chatController?.dispose();
|
|
71
85
|
};
|
|
72
86
|
};
|
|
73
87
|
exports.QChatServer = QChatServer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qChatServer.js","sourceRoot":"","sources":["../../src/language-server/qChatServer.ts"],"names":[],"mappings":";;;AACA,0DAAsD;
|
|
1
|
+
{"version":3,"file":"qChatServer.js","sourceRoot":"","sources":["../../src/language-server/qChatServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.projectCodeAnalysisScope = exports.standardScanTimeoutMs = exports.projectScanUploadIntent = void 0;
|
|
4
|
+
exports.projectScanUploadIntent = 'FULL_PROJECT_SECURITY_SCAN';
|
|
5
|
+
exports.standardScanTimeoutMs = 900_000; // 15 minutes
|
|
6
|
+
exports.projectCodeAnalysisScope = 'PROJECT';
|
|
7
|
+
//# sourceMappingURL=constants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/language-server/securityScan/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,uBAAuB,GAAG,4BAA4B,CAAA;AAEtD,QAAA,qBAAqB,GAAG,OAAO,CAAA,CAAC,aAAa;AAE7C,QAAA,wBAAwB,GAAG,SAAS,CAAA"}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import { Logging, Workspace, CancellationToken, CancellationTokenSource } from '@aws/language-server-runtimes/server-interface';
|
|
2
2
|
import { ArtifactMap, CreateUploadUrlResponse } from '../../client/token/codewhispererbearertokenclient';
|
|
3
|
-
import { CodeWhispererServiceToken } from '../codeWhispererService';
|
|
4
3
|
import { AggregatedCodeScanIssue } from './types';
|
|
4
|
+
import { AmazonQTokenServiceManager } from '../amazonQServiceManager/AmazonQTokenServiceManager';
|
|
5
5
|
export declare class SecurityScanHandler {
|
|
6
|
-
private
|
|
6
|
+
private serviceManager;
|
|
7
7
|
private workspace;
|
|
8
8
|
private logging;
|
|
9
9
|
tokenSource: CancellationTokenSource;
|
|
10
|
-
constructor(
|
|
10
|
+
constructor(serviceManager: AmazonQTokenServiceManager, workspace: Workspace, logging: Logging);
|
|
11
11
|
getMd5(content: Buffer): string;
|
|
12
12
|
throwIfCancelled(token: CancellationToken): void;
|
|
13
13
|
cancelSecurityScan(): void;
|
|
14
|
-
createCodeResourcePresignedUrlHandler(zipContent: Buffer): Promise<ArtifactMap>;
|
|
14
|
+
createCodeResourcePresignedUrlHandler(zipContent: Buffer, scanName: string): Promise<ArtifactMap>;
|
|
15
15
|
uploadArtifactToS3(zipBuffer: Buffer, resp: CreateUploadUrlResponse): Promise<void>;
|
|
16
|
-
createScanJob(artifactMap: ArtifactMap, languageName: string): Promise<import("aws-sdk/lib/request").PromiseResult<import("../../client/token/codewhispererbearertokenclient").StartCodeAnalysisResponse, import("aws-sdk").AWSError>>;
|
|
16
|
+
createScanJob(artifactMap: ArtifactMap, languageName: string, scanName: string): Promise<import("aws-sdk/lib/request").PromiseResult<import("../../client/token/codewhispererbearertokenclient").StartCodeAnalysisResponse, import("aws-sdk").AWSError>>;
|
|
17
17
|
pollScanJobStatus(jobId: string): Promise<string>;
|
|
18
18
|
listScanResults(jobId: string, projectPath: string): Promise<AggregatedCodeScanIssue[]>;
|
|
19
19
|
mapToAggregatedList(json: string, projectPath: string): Promise<AggregatedCodeScanIssue[]>;
|
|
@@ -5,14 +5,15 @@ const server_interface_1 = require("@aws/language-server-runtimes/server-interfa
|
|
|
5
5
|
const got_1 = require("got");
|
|
6
6
|
const js_md5_1 = require("js-md5");
|
|
7
7
|
const path = require("path");
|
|
8
|
+
const ScanConstants = require("./constants");
|
|
8
9
|
const commonUtil_1 = require("../dependencyGraph/commonUtil");
|
|
9
10
|
class SecurityScanHandler {
|
|
10
|
-
|
|
11
|
+
serviceManager;
|
|
11
12
|
workspace;
|
|
12
13
|
logging;
|
|
13
14
|
tokenSource;
|
|
14
|
-
constructor(
|
|
15
|
-
this.
|
|
15
|
+
constructor(serviceManager, workspace, logging) {
|
|
16
|
+
this.serviceManager = serviceManager;
|
|
16
17
|
this.workspace = workspace;
|
|
17
18
|
this.logging = logging;
|
|
18
19
|
this.tokenSource = new server_interface_1.CancellationTokenSource();
|
|
@@ -30,14 +31,21 @@ class SecurityScanHandler {
|
|
|
30
31
|
cancelSecurityScan() {
|
|
31
32
|
this.tokenSource.cancel();
|
|
32
33
|
}
|
|
33
|
-
async createCodeResourcePresignedUrlHandler(zipContent) {
|
|
34
|
+
async createCodeResourcePresignedUrlHandler(zipContent, scanName) {
|
|
35
|
+
const uploadIntent = ScanConstants.projectScanUploadIntent;
|
|
34
36
|
const request = {
|
|
35
37
|
contentMd5: this.getMd5(zipContent),
|
|
36
38
|
artifactType: 'SourceCode',
|
|
39
|
+
uploadIntent: uploadIntent,
|
|
40
|
+
uploadContext: {
|
|
41
|
+
codeAnalysisUploadContext: {
|
|
42
|
+
codeScanName: scanName,
|
|
43
|
+
},
|
|
44
|
+
},
|
|
37
45
|
};
|
|
38
46
|
try {
|
|
39
47
|
this.logging.log('Prepare for uploading src context...');
|
|
40
|
-
const response = await this.
|
|
48
|
+
const response = await this.serviceManager.getCodewhispererService().createUploadUrl(request);
|
|
41
49
|
this.logging.log(`Request id: ${response.$response.requestId}`);
|
|
42
50
|
this.logging.log(`Complete Getting presigned Url for uploading src context.`);
|
|
43
51
|
this.logging.log(`Uploading src context...`);
|
|
@@ -56,7 +64,7 @@ class SecurityScanHandler {
|
|
|
56
64
|
async uploadArtifactToS3(zipBuffer, resp) {
|
|
57
65
|
const encryptionContext = `{"uploadId":"${resp.uploadId}"}`;
|
|
58
66
|
const md5Content = this.getMd5(zipBuffer);
|
|
59
|
-
const headersObj = resp.kmsKeyArn !== ''
|
|
67
|
+
const headersObj = resp.kmsKeyArn !== '' && resp.kmsKeyArn !== undefined
|
|
60
68
|
? {
|
|
61
69
|
'Content-MD5': md5Content,
|
|
62
70
|
'x-amz-server-side-encryption': 'aws:kms',
|
|
@@ -72,20 +80,22 @@ class SecurityScanHandler {
|
|
|
72
80
|
};
|
|
73
81
|
const response = await got_1.default.put(resp.uploadUrl, {
|
|
74
82
|
body: zipBuffer,
|
|
75
|
-
headers: headersObj,
|
|
83
|
+
headers: resp?.requestHeaders ?? headersObj,
|
|
76
84
|
});
|
|
77
85
|
this.logging.log(`StatusCode: ${response.statusCode}`);
|
|
78
86
|
}
|
|
79
|
-
async createScanJob(artifactMap, languageName) {
|
|
87
|
+
async createScanJob(artifactMap, languageName, scanName) {
|
|
80
88
|
const req = {
|
|
81
89
|
artifacts: artifactMap,
|
|
82
90
|
programmingLanguage: {
|
|
83
91
|
languageName,
|
|
84
92
|
},
|
|
93
|
+
scope: ScanConstants.projectCodeAnalysisScope,
|
|
94
|
+
codeScanName: scanName,
|
|
85
95
|
};
|
|
86
96
|
this.logging.log(`Creating scan job...`);
|
|
87
97
|
try {
|
|
88
|
-
const resp = await this.
|
|
98
|
+
const resp = await this.serviceManager.getCodewhispererService().startCodeAnalysis(req);
|
|
89
99
|
this.logging.log(`Request id: ${resp.$response.requestId}`);
|
|
90
100
|
return resp;
|
|
91
101
|
}
|
|
@@ -99,13 +109,13 @@ class SecurityScanHandler {
|
|
|
99
109
|
let status = 'Pending';
|
|
100
110
|
let timer = 0;
|
|
101
111
|
const codeScanJobPollingIntervalSeconds = 1;
|
|
102
|
-
const codeScanJobTimeoutSeconds =
|
|
112
|
+
const codeScanJobTimeoutSeconds = ScanConstants.standardScanTimeoutMs;
|
|
103
113
|
// eslint-disable-next-line no-constant-condition
|
|
104
114
|
while (true) {
|
|
105
115
|
const req = {
|
|
106
116
|
jobId: jobId,
|
|
107
117
|
};
|
|
108
|
-
const resp = await this.
|
|
118
|
+
const resp = await this.serviceManager.getCodewhispererService().getCodeAnalysis(req);
|
|
109
119
|
this.logging.log(`Request id: ${resp.$response.requestId}`);
|
|
110
120
|
if (resp.status !== 'Pending') {
|
|
111
121
|
status = resp.status;
|
|
@@ -128,7 +138,7 @@ class SecurityScanHandler {
|
|
|
128
138
|
jobId,
|
|
129
139
|
codeAnalysisFindingsSchema: 'codeanalysis/findings/1.0',
|
|
130
140
|
};
|
|
131
|
-
const response = await this.
|
|
141
|
+
const response = await this.serviceManager.getCodewhispererService().listCodeAnalysisFindings(request);
|
|
132
142
|
this.logging.log(`Request id: ${response.$response.requestId}`);
|
|
133
143
|
const aggregatedCodeScanIssueList = await this.mapToAggregatedList(response.codeAnalysisFindings, projectPath);
|
|
134
144
|
return aggregatedCodeScanIssueList;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"securityScanHandler.js","sourceRoot":"","sources":["../../../src/language-server/securityScan/securityScanHandler.ts"],"names":[],"mappings":";;;AAAA,qFAKuD;AACvD,6BAAqB;AACrB,mCAA4B;AAC5B,6BAA4B;
|
|
1
|
+
{"version":3,"file":"securityScanHandler.js","sourceRoot":"","sources":["../../../src/language-server/securityScan/securityScanHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ export declare class CodeDiffTracker<T extends AcceptedSuggestionEntry = Accepte
|
|
|
35
35
|
* @param acceptedString the accepted suggestion that was inserted into the editor
|
|
36
36
|
*/
|
|
37
37
|
static checkDiff(currString?: string, acceptedString?: string): number;
|
|
38
|
-
constructor(workspace: Features['workspace'], logging: Features['logging'], recordMetric: (entry: T, codeModificationPercentage: number, unmodifiedAcceptedCharacterCount: number) => void
|
|
38
|
+
constructor(workspace: Features['workspace'], logging: Features['logging'], recordMetric: (entry: T, codeModificationPercentage: number, unmodifiedAcceptedCharacterCount: number) => Promise<void>, options?: CodeDiffTrackerOptions);
|
|
39
39
|
enqueue(suggestion: T): void;
|
|
40
40
|
shutdown(): Promise<void>;
|
|
41
41
|
get eventQueue(): T[];
|
|
@@ -97,7 +97,7 @@ class CodeDiffTracker {
|
|
|
97
97
|
});
|
|
98
98
|
const percentage = _a.checkDiff(currString, suggestion.originalString);
|
|
99
99
|
const unmodifiedAcceptedCharacterCount = (0, utils_1.getUnmodifiedAcceptedTokens)(suggestion.originalString, currString);
|
|
100
|
-
this.#recordMetric(suggestion, percentage, unmodifiedAcceptedCharacterCount);
|
|
100
|
+
await this.#recordMetric(suggestion, percentage, unmodifiedAcceptedCharacterCount);
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
103
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeDiffTracker.js","sourceRoot":"","sources":["../../../src/language-server/telemetry/codeDiffTracker.ts"],"names":[],"mappings":";;;;AAAA,6DAA8C;AAG9C,oCAAuE;AAiBvE;;;GAGG;AACH,MAAa,eAAe;IACxB;;OAEG;IACK,MAAM,CAAU,cAAc,GAAG,IAAI,GAAG,EAAE,CAAA,CAAC,WAAW;IAC9D;;OAEG;IACK,MAAM,CAAU,sBAAsB,GAAG,IAAI,GAAG,EAAE,GAAG,CAAC,CAAA,CAAC,YAAY;IACnE,MAAM,CAAU,sBAAsB,GAAG,KAAK,CAAA;IAEtD,WAAW,CAAK;IAChB,SAAS,CAAiB;IAC1B,UAAU,CAAuB;IACjC,QAAQ,CAAqB;IAC7B,aAAa,
|
|
1
|
+
{"version":3,"file":"codeDiffTracker.js","sourceRoot":"","sources":["../../../src/language-server/telemetry/codeDiffTracker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +1,24 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { CredentialsProvider, CredentialsType, Logging, Telemetry, Workspace, SDKInitializator } from '@aws/language-server-runtimes/server-interface';
|
|
1
|
+
import { CredentialsProvider, Logging, Telemetry } from '@aws/language-server-runtimes/server-interface';
|
|
3
2
|
import { CodeWhispererSession } from './session/sessionManager';
|
|
4
3
|
import { UserContext, OptOutPreference, UserIntent } from '../client/token/codewhispererbearertokenclient';
|
|
5
4
|
import { ChatConversationType, InteractWithMessageEvent } from './telemetry/types';
|
|
6
5
|
import { CodewhispererLanguage } from './languageDetection';
|
|
7
|
-
|
|
6
|
+
import { BaseAmazonQServiceManager } from './amazonQServiceManager/BaseAmazonQServiceManager';
|
|
7
|
+
export declare class TelemetryService {
|
|
8
|
+
private serviceManager;
|
|
8
9
|
private userContext;
|
|
9
10
|
private optOutPreference;
|
|
10
11
|
private enableTelemetryEventsToDestination;
|
|
11
12
|
private telemetry;
|
|
12
|
-
private credentialsType;
|
|
13
13
|
private credentialsProvider;
|
|
14
14
|
private logging;
|
|
15
15
|
private readonly cwInteractionTypeMap;
|
|
16
|
-
constructor(
|
|
16
|
+
constructor(serviceManager: BaseAmazonQServiceManager, credentialsProvider: CredentialsProvider, telemetry: Telemetry, logging: Logging);
|
|
17
17
|
updateUserContext(userContext: UserContext | undefined): void;
|
|
18
18
|
updateOptOutPreference(optOutPreference: OptOutPreference): void;
|
|
19
19
|
updateEnableTelemetryEventsToDestination(enableTelemetryEventsToDestination: boolean): void;
|
|
20
|
+
private getCredentialsType;
|
|
21
|
+
private getService;
|
|
20
22
|
private getSuggestionState;
|
|
21
23
|
private shouldSendTelemetry;
|
|
22
24
|
private logSendTelemetryEventFailure;
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TelemetryService = void 0;
|
|
4
|
-
const codeWhispererService_1 = require("./codeWhispererService");
|
|
5
4
|
const utils_1 = require("./utils");
|
|
6
5
|
const types_1 = require("./telemetry/types");
|
|
7
6
|
const languageDetection_1 = require("./languageDetection");
|
|
8
7
|
const chatTelemetryController_1 = require("./chat/telemetry/chatTelemetryController");
|
|
9
|
-
class TelemetryService
|
|
8
|
+
class TelemetryService {
|
|
9
|
+
// Using Base service manager here to support fallback cases such as in codeWhispererServer
|
|
10
|
+
serviceManager;
|
|
10
11
|
userContext;
|
|
11
12
|
optOutPreference;
|
|
12
13
|
enableTelemetryEventsToDestination;
|
|
13
14
|
telemetry;
|
|
14
|
-
credentialsType;
|
|
15
15
|
credentialsProvider;
|
|
16
16
|
logging;
|
|
17
17
|
cwInteractionTypeMap = {
|
|
@@ -25,10 +25,9 @@ class TelemetryService extends codeWhispererService_1.CodeWhispererServiceToken
|
|
|
25
25
|
[types_1.ChatInteractionType.Downvote]: 'DOWNVOTE',
|
|
26
26
|
[types_1.ChatInteractionType.ClickBodyLink]: 'CLICK_BODY_LINK',
|
|
27
27
|
};
|
|
28
|
-
constructor(
|
|
29
|
-
|
|
28
|
+
constructor(serviceManager, credentialsProvider, telemetry, logging) {
|
|
29
|
+
this.serviceManager = serviceManager;
|
|
30
30
|
this.credentialsProvider = credentialsProvider;
|
|
31
|
-
this.credentialsType = credentialsType;
|
|
32
31
|
this.telemetry = telemetry;
|
|
33
32
|
this.logging = logging;
|
|
34
33
|
this.enableTelemetryEventsToDestination = true;
|
|
@@ -42,6 +41,16 @@ class TelemetryService extends codeWhispererService_1.CodeWhispererServiceToken
|
|
|
42
41
|
updateEnableTelemetryEventsToDestination(enableTelemetryEventsToDestination) {
|
|
43
42
|
this.enableTelemetryEventsToDestination = enableTelemetryEventsToDestination;
|
|
44
43
|
}
|
|
44
|
+
getCredentialsType() {
|
|
45
|
+
return this.serviceManager.getCodewhispererService().getCredentialsType();
|
|
46
|
+
}
|
|
47
|
+
getService() {
|
|
48
|
+
const service = this.serviceManager.getCodewhispererService();
|
|
49
|
+
if (!service.sendTelemetryEvent) {
|
|
50
|
+
throw new Error(`Service of type: ${service.getCredentialsType()} returned by service manager is not compatible with TelemetryService`);
|
|
51
|
+
}
|
|
52
|
+
return service;
|
|
53
|
+
}
|
|
45
54
|
getSuggestionState(session) {
|
|
46
55
|
let suggestionState;
|
|
47
56
|
switch (session.getAggregatedUserTriggerDecision()) {
|
|
@@ -61,7 +70,7 @@ class TelemetryService extends codeWhispererService_1.CodeWhispererServiceToken
|
|
|
61
70
|
}
|
|
62
71
|
shouldSendTelemetry() {
|
|
63
72
|
const ssoConnectionType = (0, utils_1.getSsoConnectionType)(this.credentialsProvider);
|
|
64
|
-
return (this.
|
|
73
|
+
return (this.getCredentialsType() === 'bearer' &&
|
|
65
74
|
((ssoConnectionType === 'builderId' && this.optOutPreference === 'OPTIN') ||
|
|
66
75
|
ssoConnectionType === 'identityCenter'));
|
|
67
76
|
}
|
|
@@ -73,20 +82,20 @@ class TelemetryService extends codeWhispererService_1.CodeWhispererServiceToken
|
|
|
73
82
|
this.logging.log(`Failed to sendTelemetryEvent to CodeWhisperer, requestId: ${requestId ?? ''}, message: ${error?.message}`);
|
|
74
83
|
}
|
|
75
84
|
async invokeSendTelemetryEvent(event) {
|
|
76
|
-
if (!this.shouldSendTelemetry()) {
|
|
77
|
-
return;
|
|
78
|
-
}
|
|
79
|
-
const request = {
|
|
80
|
-
telemetryEvent: event,
|
|
81
|
-
};
|
|
82
|
-
if (this.userContext !== undefined) {
|
|
83
|
-
request.userContext = this.userContext;
|
|
84
|
-
}
|
|
85
|
-
if (this.optOutPreference !== undefined) {
|
|
86
|
-
request.optOutPreference = this.optOutPreference;
|
|
87
|
-
}
|
|
88
85
|
try {
|
|
89
|
-
|
|
86
|
+
if (!this.shouldSendTelemetry()) {
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
const request = {
|
|
90
|
+
telemetryEvent: event,
|
|
91
|
+
};
|
|
92
|
+
if (this.userContext !== undefined) {
|
|
93
|
+
request.userContext = this.userContext;
|
|
94
|
+
}
|
|
95
|
+
if (this.optOutPreference !== undefined) {
|
|
96
|
+
request.optOutPreference = this.optOutPreference;
|
|
97
|
+
}
|
|
98
|
+
await this.getService().sendTelemetryEvent(request);
|
|
90
99
|
}
|
|
91
100
|
catch (error) {
|
|
92
101
|
this.logSendTelemetryEventFailure(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetryService.js","sourceRoot":"","sources":["../../src/language-server/telemetryService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"telemetryService.js","sourceRoot":"","sources":["../../src/language-server/telemetryService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { TextDocument } from 'vscode-languageserver-textdocument';
|
|
2
2
|
import { ResponseContext, Suggestion } from './codeWhispererService';
|
|
3
|
+
import { TestFeatures } from '@aws/language-server-runtimes/testing';
|
|
4
|
+
import { SsoConnectionType } from './utils';
|
|
3
5
|
export declare const HELLO_WORLD_IN_CSHARP = "class HelloWorld\n{\n static void Main()\n {\n Console.WriteLine(\"Hello World!\");\n }\n}";
|
|
4
6
|
export declare const SPECIAL_CHARACTER_HELLO_WORLD = "{class HelloWorld";
|
|
5
7
|
export declare const HELLO_WORLD_WITH_WINDOWS_ENDING: string;
|
|
@@ -75,3 +77,4 @@ export declare const createIterableResponse: <T>(data: T[]) => AsyncIterable<T>;
|
|
|
75
77
|
* Copy of implementation from AWS Toolkit for VSCode https://github.com/aws/aws-toolkit-vscode/blob/a2daf60dca5e5699b8b25f6dc84708295f042c38/packages/core/src/test/testUtil.ts#L482
|
|
76
78
|
*/
|
|
77
79
|
export declare function shuffleList<T>(list: T[]): T[];
|
|
80
|
+
export declare const setCredentialsForAmazonQTokenServiceManagerFactory: (getFeatures: () => TestFeatures) => (connectionType: SsoConnectionType) => void;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createIterableResponse = exports.EMPTY_RESULT = exports.EXPECTED_RESULT_WITHOUT_REFERENCES = exports.EXPECTED_RESULT_WITH_REFERENCES = exports.EXPECTED_SUGGESTION_LIST = exports.EXPECTED_REFERENCE = exports.EXPECTED_RESULT = exports.EXPECTED_SESSION_ID = exports.EXPECTED_RESPONSE_CONTEXT = exports.EXPECTED_SUGGESTION = exports.SOME_SINGLE_LINE_FILE = exports.SINGLE_LINE_FILE_CUTOFF_INDEX = exports.HELLO_WORLD_LINE = exports.SAMPLE_FILE_OF_60_LINES_IN_JAVA = exports.SOME_FILE_WITH_EXTENSION = exports.SOME_UNSUPPORTED_FILE = exports.SOME_CLOSED_FILE = exports.SOME_FILE_WITH_ALT_CASED_LANGUAGE_ID = exports.SOME_FILE = exports.HELLO_WORLD_WITH_WINDOWS_ENDING = exports.SPECIAL_CHARACTER_HELLO_WORLD = exports.HELLO_WORLD_IN_CSHARP = void 0;
|
|
3
|
+
exports.setCredentialsForAmazonQTokenServiceManagerFactory = exports.createIterableResponse = exports.EMPTY_RESULT = exports.EXPECTED_RESULT_WITHOUT_REFERENCES = exports.EXPECTED_RESULT_WITH_REFERENCES = exports.EXPECTED_SUGGESTION_LIST = exports.EXPECTED_REFERENCE = exports.EXPECTED_RESULT = exports.EXPECTED_SESSION_ID = exports.EXPECTED_RESPONSE_CONTEXT = exports.EXPECTED_SUGGESTION = exports.SOME_SINGLE_LINE_FILE = exports.SINGLE_LINE_FILE_CUTOFF_INDEX = exports.HELLO_WORLD_LINE = exports.SAMPLE_FILE_OF_60_LINES_IN_JAVA = exports.SOME_FILE_WITH_EXTENSION = exports.SOME_UNSUPPORTED_FILE = exports.SOME_CLOSED_FILE = exports.SOME_FILE_WITH_ALT_CASED_LANGUAGE_ID = exports.SOME_FILE = exports.HELLO_WORLD_WITH_WINDOWS_ENDING = exports.SPECIAL_CHARACTER_HELLO_WORLD = exports.HELLO_WORLD_IN_CSHARP = void 0;
|
|
4
4
|
exports.shuffleList = shuffleList;
|
|
5
5
|
const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
|
|
6
6
|
exports.HELLO_WORLD_IN_CSHARP = `class HelloWorld
|
|
@@ -177,4 +177,15 @@ function shuffleList(list) {
|
|
|
177
177
|
}
|
|
178
178
|
return shuffledList;
|
|
179
179
|
}
|
|
180
|
+
const setCredentialsForAmazonQTokenServiceManagerFactory = (getFeatures) => {
|
|
181
|
+
return (connectionType) => {
|
|
182
|
+
const features = getFeatures();
|
|
183
|
+
features.credentialsProvider.hasCredentials.returns(true);
|
|
184
|
+
features.credentialsProvider.getConnectionType.returns(connectionType);
|
|
185
|
+
features.credentialsProvider.getCredentials.returns({
|
|
186
|
+
token: 'test-token',
|
|
187
|
+
});
|
|
188
|
+
};
|
|
189
|
+
};
|
|
190
|
+
exports.setCredentialsForAmazonQTokenServiceManagerFactory = setCredentialsForAmazonQTokenServiceManagerFactory;
|
|
180
191
|
//# sourceMappingURL=testUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testUtils.js","sourceRoot":"","sources":["../../src/language-server/testUtils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"testUtils.js","sourceRoot":"","sources":["../../src/language-server/testUtils.ts"],"names":[],"mappings":";;;AAwMA,kCASC;AAjND,2FAAiE;AAKpD,QAAA,qBAAqB,GAAG;;;;;;EAMnC,CAAA;AAEW,QAAA,6BAA6B,GAAG,mBAAmB,CAAA;AAEnD,QAAA,+BAA+B,GAAG,6BAAqB,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;AAEhF,QAAA,SAAS,GAAG,iDAAY,CAAC,MAAM,CAAC,iBAAiB,EAAE,QAAQ,EAAE,CAAC,EAAE,6BAAqB,CAAC,CAAA;AACtF,QAAA,oCAAoC,GAAG,iDAAY,CAAC,MAAM;AACnE,6FAA6F;AAC7F,uBAAuB,EACvB,QAAQ,EACR,CAAC,EACD,6BAAqB,CACxB,CAAA;AACY,QAAA,gBAAgB,GAAG,iDAAY,CAAC,MAAM,CAAC,mBAAmB,EAAE,QAAQ,EAAE,CAAC,EAAE,6BAAqB,CAAC,CAAA;AAC/F,QAAA,qBAAqB,GAAG,iDAAY,CAAC,MAAM,CACpD,mBAAmB,EACnB,YAAY,EACZ,CAAC,EACD,4BAA4B,CAC/B,CAAA;AACY,QAAA,wBAAwB,GAAG,iDAAY,CAAC,MAAM,CAAC,qBAAqB,EAAE,EAAE,EAAE,CAAC,EAAE,6BAAqB,CAAC,CAAA;AAEnG,QAAA,+BAA+B,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2D7C,CAAA;AAEW,QAAA,gBAAgB,GAAG,oCAAoC,CAAA;AACpE,wDAAwD;AAC3C,QAAA,6BAA6B,GAAG,CAAC,CAAA;AACjC,QAAA,qBAAqB,GAAG,iDAAY,CAAC,MAAM,CACpD,mBAAmB,EACnB,QAAQ,EACR,CAAC,EACD,wBAAgB,CAAC,SAAS,CAAC,qCAA6B,CAAC,CAC5D,CAAA;AAEY,QAAA,mBAAmB,GAAiB,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAA;AAE5F,QAAA,yBAAyB,GAAoB;IACtD,SAAS,EAAE,kBAAkB;IAC7B,sBAAsB,EAAE,kBAAkB;CAC7C,CAAA;AACY,QAAA,mBAAmB,GAAG,4BAA4B,CAAA;AAElD,QAAA,eAAe,GAAG;IAC3B,SAAS,EAAE,2BAAmB;IAC9B,KAAK,EAAE;QACH;YACI,MAAM,EAAE,2BAAmB,CAAC,CAAC,CAAC,CAAC,MAAM;YACrC,UAAU,EAAE,2BAAmB,CAAC,CAAC,CAAC,CAAC,OAAO;YAC1C,KAAK,EAAE,SAAS;YAChB,UAAU,EAAE,SAAS;SACxB;KACJ;CACJ,CAAA;AAEY,QAAA,kBAAkB,GAAG;IAC9B,WAAW,EAAE,cAAc;IAC3B,UAAU,EAAE,iBAAiB;IAC7B,GAAG,EAAE,UAAU;IACf,yBAAyB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;CAClD,CAAA;AAEY,QAAA,wBAAwB,GAAiB;IAClD,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,kCAAkC,EAAE;IAC1E,EAAE,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,+BAA+B,EAAE,UAAU,EAAE,CAAC,0BAAkB,CAAC,EAAE;CAC5G,CAAA;AAEY,QAAA,+BAA+B,GAAG;IAC3C,SAAS,EAAE,2BAAmB;IAC9B,KAAK,EAAE;QACH;YACI,MAAM,EAAE,gCAAwB,CAAC,CAAC,CAAC,CAAC,MAAM;YAC1C,UAAU,EAAE,gCAAwB,CAAC,CAAC,CAAC,CAAC,OAAO;YAC/C,KAAK,EAAE,SAAS;YAChB,UAAU,EAAE,SAAS;SACxB;QACD;YACI,MAAM,EAAE,gCAAwB,CAAC,CAAC,CAAC,CAAC,MAAM;YAC1C,UAAU,EAAE,gCAAwB,CAAC,CAAC,CAAC,CAAC,OAAO;YAC/C,KAAK,EAAE,SAAS;YAChB,UAAU,EAAE;gBACR;oBACI,WAAW,EAAE,0BAAkB,CAAC,WAAW;oBAC3C,aAAa,EAAE,0BAAkB,CAAC,UAAU;oBAC5C,YAAY,EAAE,0BAAkB,CAAC,GAAG;oBACpC,QAAQ,EAAE;wBACN,cAAc,EAAE,0BAAkB,CAAC,yBAAyB,EAAE,KAAK;wBACnE,YAAY,EAAE,0BAAkB,CAAC,yBAAyB,EAAE,GAAG;qBAClE;iBACJ;aACJ;SACJ;KACJ;CACJ,CAAA;AAEY,QAAA,kCAAkC,GAAG;IAC9C,SAAS,EAAE,2BAAmB;IAC9B,KAAK,EAAE;QACH;YACI,MAAM,EAAE,gCAAwB,CAAC,CAAC,CAAC,CAAC,MAAM;YAC1C,UAAU,EAAE,gCAAwB,CAAC,CAAC,CAAC,CAAC,OAAO;YAC/C,KAAK,EAAE,SAAS;YAChB,UAAU,EAAE,SAAS;SACxB;KACJ;CACJ,CAAA;AAEY,QAAA,YAAY,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAA;AAEjD,MAAM,sBAAsB,GAAG,CAAI,IAAS,EAAoB,EAAE;IACrE,IAAI,KAAK,GAAG,CAAC,CAAA;IAEb,OAAO;QACH,CAAC,MAAM,CAAC,aAAa,CAAC;YAClB,OAAO;gBACH,IAAI;oBACA,OAAO,OAAO,CAAC,OAAO,CAAC;wBACnB,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,MAAM;wBAC1B,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;qBACvB,CAAC,CAAA;gBACN,CAAC;aACJ,CAAA;QACL,CAAC;KACJ,CAAA;AACL,CAAC,CAAA;AAfY,QAAA,sBAAsB,0BAelC;AAED;;;GAGG;AACH,SAAgB,WAAW,CAAI,IAAS;IACpC,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;IAE9B,KAAK,IAAI,CAAC,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC/C,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAC5C;QAAA,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,OAAO,YAAY,CAAA;AACvB,CAAC;AAEM,MAAM,kDAAkD,GAAG,CAAC,WAA+B,EAAE,EAAE;IAClG,OAAO,CAAC,cAAiC,EAAE,EAAE;QACzC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAA;QAC9B,QAAQ,CAAC,mBAAmB,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACzD,QAAQ,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QACtE,QAAQ,CAAC,mBAAmB,CAAC,cAAc,CAAC,OAAO,CAAC;YAChD,KAAK,EAAE,YAAY;SACtB,CAAC,CAAA;IACN,CAAC,CAAA;AACL,CAAC,CAAA;AATY,QAAA,kDAAkD,sDAS9D"}
|
|
@@ -17,3 +17,5 @@ export declare const flattenMetric: (obj: any, prefix?: string) => any;
|
|
|
17
17
|
export declare function getSsoConnectionType(credentialsProvider: CredentialsProvider): SsoConnectionType;
|
|
18
18
|
export declare function getUnmodifiedAcceptedTokens(origin: string, after: string): number;
|
|
19
19
|
export declare function getEndPositionForAcceptedSuggestion(content: string, startPosition: Position): Position;
|
|
20
|
+
export declare function safeGet<T, E extends Error>(object: T | undefined, customError?: E): T;
|
|
21
|
+
export declare function isStringOrNull(object: any): object is string | null;
|
|
@@ -12,6 +12,8 @@ exports.getBearerTokenFromProvider = getBearerTokenFromProvider;
|
|
|
12
12
|
exports.getSsoConnectionType = getSsoConnectionType;
|
|
13
13
|
exports.getUnmodifiedAcceptedTokens = getUnmodifiedAcceptedTokens;
|
|
14
14
|
exports.getEndPositionForAcceptedSuggestion = getEndPositionForAcceptedSuggestion;
|
|
15
|
+
exports.safeGet = safeGet;
|
|
16
|
+
exports.isStringOrNull = isStringOrNull;
|
|
15
17
|
const fastest_levenshtein_1 = require("fastest-levenshtein");
|
|
16
18
|
const constants_1 = require("./constants");
|
|
17
19
|
function isAwsError(error) {
|
|
@@ -116,4 +118,13 @@ function getEndPositionForAcceptedSuggestion(content, startPosition) {
|
|
|
116
118
|
}
|
|
117
119
|
return endPosition;
|
|
118
120
|
}
|
|
121
|
+
function safeGet(object, customError) {
|
|
122
|
+
if (object === undefined) {
|
|
123
|
+
throw customError ?? new Error(`Expected object: "${String(object)} to be defined, but found undefined`);
|
|
124
|
+
}
|
|
125
|
+
return object;
|
|
126
|
+
}
|
|
127
|
+
function isStringOrNull(object) {
|
|
128
|
+
return typeof object === 'string' || object === null;
|
|
129
|
+
}
|
|
119
130
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/language-server/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/language-server/utils.ts"],"names":[],"mappings":"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"}
|