@aws/lsp-codewhisperer 0.0.3 → 0.0.5

package/out/language-server/codeWhispererServer.test.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const testing_1 = require("@aws/language-server-runtimes/out/testing");
+const server_interface_1 = require("@aws/language-server-runtimes/server-interface");
+const testing_1 = require("@aws/language-server-runtimes/testing");
 const assert = require("assert");
 const ts_sinon_1 = require("ts-sinon");
-const vscode_languageserver_1 = require("vscode-languageserver");
-const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
 const codeWhispererServer_1 = require("./codeWhispererServer");
 const sessionManager_1 = require("./session/sessionManager");
 const testUtils_1 = require("./testUtils");
@@ -67,8 +66,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             // Check the completion result
             assert.deepEqual(result, testUtils_1.EXPECTED_RESULT);
             const expectedGenerateSuggestionsRequest = {
@@ -90,8 +89,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: cutOffLine, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             // Check the completion result
             assert.deepEqual(result, testUtils_1.EXPECTED_RESULT);
             const expectedGenerateSuggestionsRequest = {
@@ -107,14 +106,14 @@ describe('CodeWhisperer Server', () => {
         });
         it('should truncate left and right context', async () => {
             const BIG_FILE_CONTENT = '123456789\n'.repeat(5000);
-            const BIG_FILE = vscode_languageserver_textdocument_1.TextDocument.create('file:///big_file.cs', 'csharp', 1, BIG_FILE_CONTENT);
+            const BIG_FILE = server_interface_1.TextDocument.create('file:///big_file.cs', 'csharp', 1, BIG_FILE_CONTENT);
             const cutOffLine = 2000;
             features.openDocument(BIG_FILE);
             await features.doInlineCompletionWithReferences({
                 textDocument: { uri: BIG_FILE.uri },
                 position: { line: cutOffLine, character: 1 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             const leftContentChecker = (leftContent) => leftContent.length == codeWhispererServer_1.CONTEXT_CHARACTERS_LIMIT && leftContent.endsWith('\n1');
             const rightContentChecker = (rightContent) => rightContent.length == codeWhispererServer_1.CONTEXT_CHARACTERS_LIMIT && rightContent.startsWith('234');
             ts_sinon_1.default.assert.calledWith(service.generateSuggestions, ts_sinon_1.default.match.hasNested('fileContext.leftFileContent', ts_sinon_1.default.match(leftContentChecker)));
@@ -124,8 +123,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE_WITH_ALT_CASED_LANGUAGE_ID.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             // Check the completion result
             assert.deepEqual(result, testUtils_1.EXPECTED_RESULT);
             const expectedGenerateSuggestionsRequest = {
@@ -143,8 +142,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_CLOSED_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             // Check the completion result
             assert.deepEqual(result, testUtils_1.EMPTY_RESULT);
             // Check the service was not called
@@ -154,8 +153,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_UNSUPPORTED_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             // Check the completion result
             assert.deepEqual(result, testUtils_1.EMPTY_RESULT);
             // Check the service was not called
@@ -165,8 +164,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE_WITH_EXTENSION.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             // Check the completion result
             assert.deepEqual(result, testUtils_1.EXPECTED_RESULT);
             const expectedGenerateSuggestionsRequest = {
@@ -192,8 +191,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             assert.deepEqual(result, testUtils_1.EMPTY_RESULT);
         });
         it('should only show the part of the recommendation that does not overlap with the right context in multiline', async () => {
@@ -204,7 +203,7 @@ describe('CodeWhisperer Server', () => {
             // We delete the static void Main line from Hello World but keep the rest in the file
             const deletedLine = lines.splice(cutOffLine, 1)[0];
             const finalFileContent = lines.join('\n');
-            const MY_FILE = vscode_languageserver_textdocument_1.TextDocument.create('file:///rightContext.cs', 'csharp', 1, finalFileContent);
+            const MY_FILE = server_interface_1.TextDocument.create('file:///rightContext.cs', 'csharp', 1, finalFileContent);
             features.openDocument(MY_FILE);
             const EXPECTED_SUGGESTION = [{ itemId: 'cwspr-item-id', content: recommendation }];
             service.generateSuggestions.returns(Promise.resolve({
@@ -227,8 +226,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.doInlineCompletionWithReferences({
                 textDocument: { uri: MY_FILE.uri },
                 position: { line: cutOffLine, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             assert.deepEqual(result, EXPECTED_RESULT);
             const leftContext = lines.slice(0, cutOffLine).join('\n') + '\n';
             const rightContext = lines.slice(cutOffLine).join('\n');
@@ -246,13 +245,13 @@ describe('CodeWhisperer Server', () => {
         it('should convert windows newlines to UNIX newlines in request file contents', async () => {
             const cutOffLine = 2;
             const lines = testUtils_1.HELLO_WORLD_WITH_WINDOWS_ENDING.split('\r\n');
-            const MY_WINDOWS_FILE = vscode_languageserver_textdocument_1.TextDocument.create('file:///rightContext.cs', 'csharp', 1, testUtils_1.HELLO_WORLD_WITH_WINDOWS_ENDING);
+            const MY_WINDOWS_FILE = server_interface_1.TextDocument.create('file:///rightContext.cs', 'csharp', 1, testUtils_1.HELLO_WORLD_WITH_WINDOWS_ENDING);
             features.openDocument(MY_WINDOWS_FILE);
             await features.doInlineCompletionWithReferences({
                 textDocument: { uri: MY_WINDOWS_FILE.uri },
                 position: { line: cutOffLine, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             const modifiedLeftContext = lines.slice(0, cutOffLine).join('\n') + '\n';
             const modifiedRightContext = lines.slice(cutOffLine).join('\n');
             const expectedGenerateSuggestionsRequest = {
@@ -286,8 +285,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_SINGLE_LINE_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             assert.deepEqual(result, EXPECTED_RESULT);
         });
         it('should show full recommendation when the right context does not match recommendation ', async () => {
@@ -310,8 +309,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             assert.deepEqual(result, EXPECTED_RESULT);
         });
         it('should return empty recommendations list on failed request', async () => {
@@ -320,8 +319,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             // Check the completion result
             assert.deepEqual(result, testUtils_1.EMPTY_RESULT);
         });
@@ -376,8 +375,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.openDocument(testUtils_1.SOME_FILE).doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             // Check the completion result
             assert.deepEqual(result, testUtils_1.EXPECTED_RESULT_WITHOUT_REFERENCES);
         });
@@ -387,8 +386,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.openDocument(testUtils_1.SOME_FILE).doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             // Check the completion result
             assert.deepEqual(result, testUtils_1.EXPECTED_RESULT_WITHOUT_REFERENCES);
         });
@@ -398,8 +397,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.openDocument(testUtils_1.SOME_FILE).doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             // Check the completion result
             assert.deepEqual(result, testUtils_1.EXPECTED_RESULT_WITH_REFERENCES);
         });
@@ -409,8 +408,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.openDocument(testUtils_1.SOME_FILE).doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             // Check the completion result
             assert.deepEqual(result, testUtils_1.EXPECTED_RESULT_WITHOUT_REFERENCES);
         });
@@ -422,8 +421,8 @@ describe('CodeWhisperer Server', () => {
             const result = await afterConfigChange.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             // Check the completion result
             assert.deepEqual(result, testUtils_1.EXPECTED_RESULT_WITHOUT_REFERENCES);
         });
@@ -435,8 +434,8 @@ describe('CodeWhisperer Server', () => {
             const result = await afterConfigChange.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             // Check the completion result
             assert.deepEqual(result, testUtils_1.EXPECTED_RESULT_WITH_REFERENCES);
         });
@@ -451,8 +450,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.openDocument(testUtils_1.SOME_FILE).doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             assert.deepEqual(result, testUtils_1.EMPTY_RESULT);
         });
         it('should show references and update range when there is partial overlap on right context', async () => {
@@ -465,7 +464,7 @@ describe('CodeWhisperer Server', () => {
             // We delete the static void Main line from Hello World but keep the rest in the file
             const deletedLine = lines.splice(cutOffLine, 1)[0];
             const finalFileContent = lines.join('\n');
-            const MY_FILE = vscode_languageserver_textdocument_1.TextDocument.create('file:///rightContext.cs', 'csharp', 1, finalFileContent);
+            const MY_FILE = server_interface_1.TextDocument.create('file:///rightContext.cs', 'csharp', 1, finalFileContent);
             features.openDocument(MY_FILE);
             const EXPECTED_REFERENCE_WITH_LONG_RANGE = {
                 ...testUtils_1.EXPECTED_REFERENCE,
@@ -503,8 +502,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.openDocument(MY_FILE).doInlineCompletionWithReferences({
                 textDocument: { uri: MY_FILE.uri },
                 position: { line: cutOffLine, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             assert.deepEqual(result, EXPECTED_RESULT);
         });
         it('should discard reference if it references trimmed content after right-context merge', async () => {
@@ -517,7 +516,7 @@ describe('CodeWhisperer Server', () => {
             // We delete the static void Main line from Hello World but keep the rest in the file
             const deletedLine = lines.splice(cutOffLine, 1)[0];
             const finalFileContent = lines.join('\n');
-            const MY_FILE = vscode_languageserver_textdocument_1.TextDocument.create('file:///rightContext.cs', 'csharp', 1, finalFileContent);
+            const MY_FILE = server_interface_1.TextDocument.create('file:///rightContext.cs', 'csharp', 1, finalFileContent);
             features.openDocument(MY_FILE);
             const insertText = deletedLine.concat('\n    ');
             // reference range covers portion of string that will be removed
@@ -546,8 +545,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.openDocument(MY_FILE).doInlineCompletionWithReferences({
                 textDocument: { uri: MY_FILE.uri },
                 position: { line: cutOffLine, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             assert.deepEqual(result, EXPECTED_RESULT);
         });
         describe('With session management', () => {
@@ -568,8 +567,8 @@ describe('CodeWhisperer Server', () => {
                 const result = await features.openDocument(testUtils_1.SOME_FILE).doInlineCompletionWithReferences({
                     textDocument: { uri: testUtils_1.SOME_FILE.uri },
                     position: { line: 0, character: 0 },
-                    context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-                }, vscode_languageserver_1.CancellationToken.None);
+                    context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+                }, server_interface_1.CancellationToken.None);
                 // Check the completion result
                 assert.deepEqual(result, testUtils_1.EMPTY_RESULT);
                 // There is no active session
@@ -611,15 +610,15 @@ describe('CodeWhisperer Server', () => {
         it('should return recommendations on an above-threshold auto-trigger position', async () => {
             // Similar to test from above, this test case also depends on file contents not starting with a new line
             const HELLO_WORLD_IN_CSHARP_WITHOUT_NEWLINE = testUtils_1.HELLO_WORLD_IN_CSHARP.trimStart();
-            const SOME_FILE = vscode_languageserver_textdocument_1.TextDocument.create('file:///test.cs', 'csharp', 1, HELLO_WORLD_IN_CSHARP_WITHOUT_NEWLINE);
+            const SOME_FILE = server_interface_1.TextDocument.create('file:///test.cs', 'csharp', 1, HELLO_WORLD_IN_CSHARP_WITHOUT_NEWLINE);
             features.openDocument(SOME_FILE);
             const LEFT_FILE_CONTEXT = HELLO_WORLD_IN_CSHARP_WITHOUT_NEWLINE.substring(0, 40);
             const RIGHT_FILE_CONTEXT = HELLO_WORLD_IN_CSHARP_WITHOUT_NEWLINE.substring(40);
             const result = await features.doInlineCompletionWithReferences({
                 textDocument: { uri: SOME_FILE.uri },
                 position: AUTO_TRIGGER_POSITION,
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Automatic },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Automatic },
+            }, server_interface_1.CancellationToken.None);
             // Check the completion result
             assert.deepEqual(result, testUtils_1.EXPECTED_RESULT);
             const expectedGenerateSuggestionsRequest = {
@@ -637,8 +636,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Automatic },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Automatic },
+            }, server_interface_1.CancellationToken.None);
             // Check the completion result
             assert.deepEqual(result, testUtils_1.EMPTY_RESULT);
         });
@@ -789,8 +788,8 @@ describe('CodeWhisperer Server', () => {
             await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             const expectedServiceInvocationMetric = {
                 name: 'codewhisperer_serviceInvocation',
                 result: 'Succeeded',
@@ -824,8 +823,8 @@ describe('CodeWhisperer Server', () => {
             await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             const expectedServiceInvocationMetric = {
                 name: 'codewhisperer_serviceInvocation',
                 result: 'Succeeded',
@@ -852,8 +851,8 @@ describe('CodeWhisperer Server', () => {
             await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             const expectedServiceInvocationMetric = {
                 name: 'codewhisperer_serviceInvocation',
                 result: 'Failed',
@@ -883,8 +882,8 @@ describe('CodeWhisperer Server', () => {
             await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             const expectedServiceInvocationMetric = {
                 name: 'codewhisperer_serviceInvocation',
                 result: 'Failed',
@@ -923,8 +922,8 @@ describe('CodeWhisperer Server', () => {
             const getCompletionsPromise = features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             await getCompletionsPromise;
             const expectedServiceInvocationMetric = {
                 name: 'codewhisperer_serviceInvocation',
@@ -954,8 +953,8 @@ describe('CodeWhisperer Server', () => {
             await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             await features.doLogInlineCompletionSessionResults(sessionResultData);
             const expectedPerceivedLatencyMetric = {
                 name: 'codewhisperer_perceivedLatency',
@@ -979,8 +978,8 @@ describe('CodeWhisperer Server', () => {
             await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             await features.doLogInlineCompletionSessionResults(sessionResultDataWithoutLatency);
             ts_sinon_1.default.assert.neverCalledWith(features.telemetry.emitMetric, ts_sinon_1.default.match.has('name', 'codewhisperer_perceivedLatency'));
         });
@@ -994,8 +993,8 @@ describe('CodeWhisperer Server', () => {
                 await features.doInlineCompletionWithReferences({
                     textDocument: { uri: testUtils_1.SOME_FILE.uri },
                     position: { line: 0, character: 0 },
-                    context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-                }, vscode_languageserver_1.CancellationToken.None);
+                    context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+                }, server_interface_1.CancellationToken.None);
                 assert.equal(features.telemetry.emitMetric.getCall(0).args[0].data.credentialStartUrl, 'http://teststarturl');
             });
             it('should send empty credentialStartUrl field if not available in credentialsProvider', async () => {
@@ -1003,8 +1002,8 @@ describe('CodeWhisperer Server', () => {
                 await features.doInlineCompletionWithReferences({
                     textDocument: { uri: testUtils_1.SOME_FILE.uri },
                     position: { line: 0, character: 0 },
-                    context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-                }, vscode_languageserver_1.CancellationToken.None);
+                    context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+                }, server_interface_1.CancellationToken.None);
                 assert.equal(features.telemetry.emitMetric.getCall(0).args[0].data.credentialStartUrl, undefined);
             });
         });
@@ -1047,8 +1046,8 @@ describe('CodeWhisperer Server', () => {
             await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: AUTO_TRIGGER_POSITION,
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Automatic },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Automatic },
+            }, server_interface_1.CancellationToken.None);
             // Get session after call is done
             activeSession = sessionManager.getCurrentSession();
             const expectedSessionData = {
@@ -1074,18 +1073,18 @@ describe('CodeWhisperer Server', () => {
                 features.doInlineCompletionWithReferences({
                     textDocument: { uri: testUtils_1.SOME_FILE.uri },
                     position: AUTO_TRIGGER_POSITION,
-                    context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Automatic },
-                }, vscode_languageserver_1.CancellationToken.None),
+                    context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Automatic },
+                }, server_interface_1.CancellationToken.None),
                 features.doInlineCompletionWithReferences({
                     textDocument: { uri: testUtils_1.SOME_FILE.uri },
                     position: AUTO_TRIGGER_POSITION,
-                    context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Automatic },
-                }, vscode_languageserver_1.CancellationToken.None),
+                    context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Automatic },
+                }, server_interface_1.CancellationToken.None),
                 features.doInlineCompletionWithReferences({
                     textDocument: { uri: testUtils_1.SOME_FILE.uri },
                     position: AUTO_TRIGGER_POSITION,
-                    context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Automatic },
-                }, vscode_languageserver_1.CancellationToken.None),
+                    context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Automatic },
+                }, server_interface_1.CancellationToken.None),
             ]);
             // 3 requests were processed by server, but only first should return results
             const EXPECTED_COMPLETION_RESPONSES = [
@@ -1119,18 +1118,18 @@ describe('CodeWhisperer Server', () => {
                 features.doInlineCompletionWithReferences({
                     textDocument: { uri: testUtils_1.SOME_FILE.uri },
                     position: AUTO_TRIGGER_POSITION,
-                    context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Automatic },
-                }, vscode_languageserver_1.CancellationToken.None),
+                    context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Automatic },
+                }, server_interface_1.CancellationToken.None),
                 features.doInlineCompletionWithReferences({
                     textDocument: { uri: testUtils_1.SOME_FILE.uri },
                     position: AUTO_TRIGGER_POSITION,
-                    context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Automatic },
-                }, vscode_languageserver_1.CancellationToken.None),
+                    context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Automatic },
+                }, server_interface_1.CancellationToken.None),
                 features.doInlineCompletionWithReferences({
                     textDocument: { uri: testUtils_1.SOME_FILE.uri },
                     position: AUTO_TRIGGER_POSITION,
-                    context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Automatic },
-                }, vscode_languageserver_1.CancellationToken.None),
+                    context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Automatic },
+                }, server_interface_1.CancellationToken.None),
             ]);
             // Get session after call is done
             const firstActiveSession = sessionManager.getCurrentSession();
@@ -1138,8 +1137,8 @@ describe('CodeWhisperer Server', () => {
             await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: AUTO_TRIGGER_POSITION,
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Automatic },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Automatic },
+            }, server_interface_1.CancellationToken.None);
             assert.equal(sessionManagerSpy.createSession.callCount, 4);
             assert.equal(sessionManager.getSessionsLog().length, 4);
             const latestSession = sessionManager.getCurrentSession();
@@ -1158,8 +1157,8 @@ describe('CodeWhisperer Server', () => {
             await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: AUTO_TRIGGER_POSITION,
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Automatic },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Automatic },
+            }, server_interface_1.CancellationToken.None);
             // Get session after call is done
             const currentSession = sessionManager.getCurrentSession();
             assert(currentSession);
@@ -1167,13 +1166,13 @@ describe('CodeWhisperer Server', () => {
             ts_sinon_1.default.assert.calledOnceWithExactly(sessionManagerSpy.closeSession, currentSession);
         });
         it('Manual completion invocation should close previous session', async () => {
-            const TRIGGER_KIND = vscode_languageserver_1.InlineCompletionTriggerKind.Invoked;
+            const TRIGGER_KIND = server_interface_1.InlineCompletionTriggerKind.Invoked;
             const result = await features.doInlineCompletionWithReferences({
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
                 // Manual trigger kind
                 context: { triggerKind: TRIGGER_KIND },
-            }, vscode_languageserver_1.CancellationToken.None);
+            }, server_interface_1.CancellationToken.None);
             assert.deepEqual(result, testUtils_1.EXPECTED_RESULT);
             const firstSession = sessionManager.getActiveSession();
             // There is ACTIVE session
@@ -1184,7 +1183,7 @@ describe('CodeWhisperer Server', () => {
                 textDocument: { uri: testUtils_1.SOME_FILE.uri },
                 position: { line: 0, character: 0 },
                 context: { triggerKind: TRIGGER_KIND },
-            }, vscode_languageserver_1.CancellationToken.None);
+            }, server_interface_1.CancellationToken.None);
             assert.deepEqual(secondResult, { ...testUtils_1.EXPECTED_RESULT, sessionId: SESSION_IDS_LOG[1] });
             ts_sinon_1.default.assert.called(sessionManagerSpy.closeCurrentSession);
         });
@@ -1193,7 +1192,7 @@ describe('CodeWhisperer Server', () => {
             // This test fails when the file starts with a new line, probably due to the way we handle right context merge
             // So let's use hello world without the newline in the beginning
             const HELLO_WORLD_IN_CSHARP_WITHOUT_NEWLINE = testUtils_1.HELLO_WORLD_IN_CSHARP.trimStart();
-            const SOME_FILE = vscode_languageserver_textdocument_1.TextDocument.create('file:///test.cs', 'csharp', 1, HELLO_WORLD_IN_CSHARP_WITHOUT_NEWLINE);
+            const SOME_FILE = server_interface_1.TextDocument.create('file:///test.cs', 'csharp', 1, HELLO_WORLD_IN_CSHARP_WITHOUT_NEWLINE);
             features.openDocument(SOME_FILE);
             const EXPECTED_SUGGESTION = [
                 { itemId: 'cwspr-item-id', content: HELLO_WORLD_IN_CSHARP_WITHOUT_NEWLINE },
@@ -1205,8 +1204,8 @@ describe('CodeWhisperer Server', () => {
             const result = await features.doInlineCompletionWithReferences({
                 textDocument: { uri: SOME_FILE.uri },
                 position: { line: 0, character: 0 },
-                context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-            }, vscode_languageserver_1.CancellationToken.None);
+                context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+            }, server_interface_1.CancellationToken.None);
             assert.deepEqual(result, testUtils_1.EMPTY_RESULT);
             const session = sessionManager.getCurrentSession();
             assert(session);