@aws/lsp-codewhisperer 0.0.4 → 0.0.6

package/out/language-server/chat/contexts/documentContext.js

@@ -0,0 +1,59 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _DocumentContextExtractor_characterLimits;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DocumentContextExtractor = void 0;
+const languageDetection_1 = require("../../languageDetection");
+const utils_1 = require("./utils");
+class DocumentContextExtractor {
+    constructor(characterLimits = DocumentContextExtractor.DEFAULT_CHARACTER_LIMIT) {
+        _DocumentContextExtractor_characterLimits.set(this, void 0);
+        __classPrivateFieldSet(this, _DocumentContextExtractor_characterLimits, characterLimits, "f");
+    }
+    /**
+     * From the given the cursor state, we want to give Q context up to the characters limit
+     * on both sides of the cursor.
+     */
+    async extractEditorState(document, cursorState) {
+        const targetRange = 'position' in cursorState
+            ? {
+                start: cursorState.position,
+                end: cursorState.position,
+            }
+            : cursorState.range;
+        const codeBlockRange = (0, utils_1.getExtendedCodeBlockRange)(document, targetRange, __classPrivateFieldGet(this, _DocumentContextExtractor_characterLimits, "f"));
+        const rangeWithinCodeBlock = (0, utils_1.getSelectionWithinExtendedRange)(targetRange, codeBlockRange);
+        return {
+            document: await this.extractDocumentContext(document, codeBlockRange),
+            cursorState: rangeWithinCodeBlock ? { range: rangeWithinCodeBlock } : undefined,
+        };
+    }
+    /**
+     * Extract document context from the given range inside a document
+     */
+    async extractDocumentContext(document, codeBlockRange) {
+        const text = document.getText(codeBlockRange);
+        const languageId = (0, languageDetection_1.getLanguageId)(document);
+        const relativeFilePath = document.uri;
+        return {
+            text,
+            programmingLanguage: languageId ? { languageName: languageId } : undefined,
+            relativeFilePath,
+            documentSymbols: [],
+        };
+    }
+}
+exports.DocumentContextExtractor = DocumentContextExtractor;
+_DocumentContextExtractor_characterLimits = new WeakMap();
+DocumentContextExtractor.DEFAULT_CHARACTER_LIMIT = 9000;
+//# sourceMappingURL=documentContext.js.map

package/out/language-server/chat/contexts/documentContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"documentContext.js","sourceRoot":"","sources":["../../../../src/language-server/chat/contexts/documentContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,+DAAuD;AACvD,mCAAoF;AAEpF,MAAa,wBAAwB;IAKjC,YAAY,kBAA0B,wBAAwB,CAAC,uBAAuB;QAFtF,4DAAwB;QAGpB,uBAAA,IAAI,6CAAoB,eAAe,MAAA,CAAA;IAC3C,CAAC;IACD;;;OAGG;IACI,KAAK,CAAC,kBAAkB,CAAC,QAAsB,EAAE,WAAwB;QAC5E,MAAM,WAAW,GACb,UAAU,IAAI,WAAW;YACrB,CAAC,CAAC;gBACI,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,GAAG,EAAE,WAAW,CAAC,QAAQ;aAC5B;YACH,CAAC,CAAC,WAAW,CAAC,KAAK,CAAA;QAE3B,MAAM,cAAc,GAAG,IAAA,iCAAyB,EAAC,QAAQ,EAAE,WAAW,EAAE,uBAAA,IAAI,iDAAiB,CAAC,CAAA;QAE9F,MAAM,oBAAoB,GAAG,IAAA,uCAA+B,EAAC,WAAW,EAAE,cAAc,CAAC,CAAA;QAEzF,OAAO;YACH,QAAQ,EAAE,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,cAAc,CAAC;YACrE,WAAW,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC,CAAC,CAAC,SAAS;SAClF,CAAA;IACL,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,sBAAsB,CAC/B,QAAsB,EACtB,cAAqB;QAErB,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAC7C,MAAM,UAAU,GAAG,IAAA,iCAAa,EAAC,QAAQ,CAAC,CAAA;QAC1C,MAAM,gBAAgB,GAAG,QAAQ,CAAC,GAAG,CAAA;QAErC,OAAO;YACH,IAAI;YACJ,mBAAmB,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,SAAS;YAC1E,gBAAgB;YAChB,eAAe,EAAE,EAAE;SACtB,CAAA;IACL,CAAC;;AAhDL,4DAiDC;;AAhD2B,gDAAuB,GAAG,IAAI,AAAP,CAAO"}

package/out/language-server/chat/contexts/documentContext.test.d.ts

@@ -0,0 +1 @@
+export {};

package/out/language-server/chat/contexts/documentContext.test.js

@@ -0,0 +1,147 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert = require("assert");
+const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
+const documentContext_1 = require("./documentContext");
+describe('DocumentContext', () => {
+    const mockTypescriptCodeBlock = `function test() {
+    console.log('test')
+}`;
+    const mockTSDocument = vscode_languageserver_textdocument_1.TextDocument.create('file://test.ts', 'typescript', 1, mockTypescriptCodeBlock);
+    describe('documentContextExtractor.extractEditorState', () => {
+        it('extracts editor state for range selection', async () => {
+            const documentContextExtractor = new documentContext_1.DocumentContextExtractor(19);
+            const expected = {
+                document: {
+                    programmingLanguage: { languageName: 'typescript' },
+                    relativeFilePath: 'file://test.ts',
+                    documentSymbols: [],
+                    text: "console.log('test')",
+                },
+                cursorState: {
+                    range: {
+                        start: {
+                            line: 0,
+                            character: 8,
+                        },
+                        end: {
+                            line: 0,
+                            character: 11,
+                        },
+                    },
+                },
+            };
+            const result = await documentContextExtractor.extractEditorState(mockTSDocument, {
+                // highlighting "log"
+                range: {
+                    start: {
+                        line: 1,
+                        character: 12,
+                    },
+                    end: {
+                        line: 1,
+                        character: 15,
+                    },
+                },
+            });
+            assert.deepStrictEqual(result, expected);
+        });
+        it('extracts editor state for collapsed position', async () => {
+            const documentContextExtractor = new documentContext_1.DocumentContextExtractor(19);
+            const expected = {
+                document: {
+                    programmingLanguage: { languageName: 'typescript' },
+                    relativeFilePath: 'file://test.ts',
+                    documentSymbols: [],
+                    text: "console.log('test')",
+                },
+                cursorState: {
+                    range: {
+                        start: {
+                            line: 0,
+                            character: 9,
+                        },
+                        end: {
+                            line: 0,
+                            character: 10,
+                        },
+                    },
+                },
+            };
+            const result = await documentContextExtractor.extractEditorState(mockTSDocument, {
+                // highlighting "o" in "log"
+                range: {
+                    start: {
+                        line: 1,
+                        character: 13,
+                    },
+                    end: {
+                        line: 1,
+                        character: 14,
+                    },
+                },
+            });
+            assert.deepStrictEqual(result, expected);
+        });
+        it('returns undefined cursorState if the end position was collapsed', async () => {
+            const documentContextExtractor = new documentContext_1.DocumentContextExtractor(0);
+            const expected = {
+                document: {
+                    programmingLanguage: { languageName: 'typescript' },
+                    relativeFilePath: 'file://test.ts',
+                    documentSymbols: [],
+                    text: '',
+                },
+                cursorState: undefined,
+            };
+            const result = await documentContextExtractor.extractEditorState(mockTSDocument, {
+                range: {
+                    start: {
+                        line: 1,
+                        character: 13,
+                    },
+                    end: {
+                        line: 1,
+                        character: 13,
+                    },
+                },
+            });
+            assert.deepStrictEqual(result, expected);
+        });
+    });
+    describe('extractDocumentContext', () => {
+        it('extract document context with the code block range correctly', async () => {
+            const documentContextExtractor = new documentContext_1.DocumentContextExtractor();
+            const expectedResult = {
+                programmingLanguage: { languageName: 'typescript' },
+                relativeFilePath: 'file://test.ts',
+                documentSymbols: [],
+                text: "console.log('test')",
+            };
+            const result = await documentContextExtractor.extractDocumentContext(mockTSDocument, {
+                start: { line: 1, character: 4 },
+                end: { line: 1, character: 23 },
+            });
+            assert.deepStrictEqual(result, expectedResult);
+        });
+        it('handles other languages correctly', async () => {
+            const documentContextExtractor = new documentContext_1.DocumentContextExtractor();
+            const mockGoCodeBLock = `func main() {
+    fmt.Println("test")
+}`;
+            const mockDocument = vscode_languageserver_textdocument_1.TextDocument.create('file://test.go', 'go', 1, mockGoCodeBLock);
+            const expectedResult = {
+                programmingLanguage: { languageName: 'go' },
+                relativeFilePath: 'file://test.go',
+                documentSymbols: [],
+                text: 'fmt.Println("test")',
+            };
+            const result = await documentContextExtractor.extractDocumentContext(mockDocument, {
+                start: { line: 1, character: 4 },
+                end: { line: 1, character: 23 },
+            });
+            assert.deepStrictEqual(result, expectedResult);
+        });
+    });
+});
+//# sourceMappingURL=documentContext.test.js.map

package/out/language-server/chat/contexts/documentContext.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"documentContext.test.js","sourceRoot":"","sources":["../../../../src/language-server/chat/contexts/documentContext.test.ts"],"names":[],"mappings":"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"}

package/out/language-server/chat/contexts/utils.d.ts

@@ -0,0 +1,10 @@
+import { Range, TextDocument } from 'vscode-languageserver-textdocument';
+/**
+ * Extend the cursor range on both ends up to charactersLimit for context (if applicable)
+ */
+export declare function getExtendedCodeBlockRange(document: TextDocument, originalRange: Range, charactersLimit: number): Range;
+/**
+ * Since we are only sending over the code block, the selection that
+ * reflects the position in the entire document needs to be adjusted.
+ */
+export declare function getSelectionWithinExtendedRange(selection: Range, extendedRange: Range): Range | undefined;

package/out/language-server/chat/contexts/utils.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSelectionWithinExtendedRange = exports.getExtendedCodeBlockRange = void 0;
+/**
+ * Extend the cursor range on both ends up to charactersLimit for context (if applicable)
+ */
+function getExtendedCodeBlockRange(document, originalRange, charactersLimit) {
+    let startOffset = document.offsetAt(originalRange.start);
+    let endOffset = document.offsetAt(originalRange.end);
+    const totalSelectedCharacters = endOffset - startOffset;
+    // if the total selected characters are greater than the character limit, trims the characters
+    if (totalSelectedCharacters >= charactersLimit) {
+        return {
+            start: document.positionAt(startOffset),
+            end: document.positionAt(startOffset + charactersLimit),
+        };
+    }
+    // lineCount + 1 puts us outside the bound so `.offsetAt` returns the max offset
+    const maxOffset = document.offsetAt({
+        line: document.lineCount + 1,
+        character: 0,
+    });
+    const extraCharactersAllowed = charactersLimit - totalSelectedCharacters;
+    // Accounting for the edge case when there is an odd number of characters
+    const prependCharacterCount = Math.ceil(extraCharactersAllowed / 2);
+    const appendCharacterCount = Math.floor(extraCharactersAllowed / 2);
+    // Try adding number of extra characters "equally" on both end first
+    startOffset = Math.max(0, startOffset - prependCharacterCount);
+    endOffset = Math.min(endOffset + appendCharacterCount, maxOffset);
+    // If there are remaining characters, which means that we reached at least one end of the document
+    const remainingCharacters = charactersLimit - (endOffset - startOffset);
+    if (remainingCharacters > 0) {
+        // Since we are at the beginning on the document, try adding the remaining characters to the end, and vice versa.
+        if (startOffset === 0) {
+            endOffset = Math.min(endOffset + remainingCharacters, maxOffset);
+        }
+        else {
+            startOffset = Math.max(startOffset - remainingCharacters, 0);
+        }
+    }
+    return {
+        start: document.positionAt(startOffset),
+        end: document.positionAt(endOffset),
+    };
+}
+exports.getExtendedCodeBlockRange = getExtendedCodeBlockRange;
+/**
+ * Since we are only sending over the code block, the selection that
+ * reflects the position in the entire document needs to be adjusted.
+ */
+function getSelectionWithinExtendedRange(selection, extendedRange) {
+    if (selection.start.line === selection.end.line && selection.start.character === selection.end.character) {
+        return undefined;
+    }
+    return {
+        start: {
+            line: selection.start.line - extendedRange.start.line,
+            character: selection.start.line === extendedRange.start.line
+                ? selection.start.character - extendedRange.start.character
+                : selection.start.character,
+        },
+        end: {
+            line: selection.end.line - extendedRange.start.line,
+            character: selection.end.line === extendedRange.end.line
+                ? selection.end.character - extendedRange.start.character
+                : selection.end.character,
+        },
+    };
+}
+exports.getSelectionWithinExtendedRange = getSelectionWithinExtendedRange;
+//# sourceMappingURL=utils.js.map

package/out/language-server/chat/contexts/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/language-server/chat/contexts/utils.ts"],"names":[],"mappings":"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"}

package/out/language-server/chat/contexts/utils.test.d.ts

@@ -0,0 +1 @@
+export {};

package/out/language-server/chat/contexts/utils.test.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert = require("assert");
+const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
+const utils_1 = require("./utils");
+describe('getExtendedCodeBlockRange', () => {
+    const mockDocument = vscode_languageserver_textdocument_1.TextDocument.create('file://test.ts', 'typescript', 1, `const fs = require('node:fs/promises');
+    async function example(file: string) {
+      try {
+        const data = await fs.readFile(file, { encoding: 'utf8' });
+        console.log(data);
+      } catch (err) {
+        console.error(err);
+      }
+    }
+    example('/Users/user1/test.txt');`);
+    it('able to extend a code block range up to the character limit', () => {
+        const result = (0, utils_1.getExtendedCodeBlockRange)(mockDocument, {
+            // highlightling "console"
+            start: { line: 4, character: 8 },
+            end: { line: 4, character: 14 },
+        }, 10);
+        assert.deepStrictEqual(result, {
+            start: { line: 4, character: 6 },
+            end: { line: 4, character: 16 },
+        });
+    });
+    it('able to extend a code block range correctly if character limit is an odd number', () => {
+        const result = (0, utils_1.getExtendedCodeBlockRange)(mockDocument, {
+            // highlightling "console"
+            start: { line: 4, character: 8 },
+            end: { line: 4, character: 14 },
+        }, 9);
+        assert.deepStrictEqual(result, {
+            start: { line: 4, character: 6 },
+            end: { line: 4, character: 15 },
+        });
+    });
+    it('does not extend beyond the lower document bound', () => {
+        const result = (0, utils_1.getExtendedCodeBlockRange)(mockDocument, {
+            // highlighting "fs" in document
+            start: { line: 0, character: 6 },
+            end: { line: 0, character: 8 },
+        }, 20);
+        assert.deepStrictEqual(result, {
+            start: { line: 0, character: 0 },
+            end: { line: 0, character: 20 },
+        });
+    });
+    it('does not extend beyond the upper document bound', () => {
+        const result = (0, utils_1.getExtendedCodeBlockRange)(mockDocument, {
+            // highlighting "test" on the last line in document
+            start: { line: 9, character: 26 },
+            end: { line: 9, character: 30 },
+        }, 20);
+        assert.deepStrictEqual(result, {
+            start: { line: 9, character: 17 },
+            end: { line: 9, character: 37 },
+        });
+    });
+    it('trims text if already exceeds character limit', () => {
+        const result = (0, utils_1.getExtendedCodeBlockRange)(mockDocument, {
+            start: { line: 3, character: 8 },
+            end: { line: 3, character: 60 },
+        }, 40);
+        assert.deepStrictEqual(result, {
+            start: { line: 3, character: 8 },
+            end: { line: 3, character: 48 },
+        });
+    });
+});
+//# sourceMappingURL=utils.test.js.map

package/out/language-server/chat/contexts/utils.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../../src/language-server/chat/contexts/utils.test.ts"],"names":[],"mappings":";;AAAA,iCAAgC;AAChC,2FAAiE;AACjE,mCAAmD;AAEnD,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACvC,MAAM,YAAY,GAAG,iDAAY,CAAC,MAAM,CACpC,gBAAgB,EAChB,YAAY,EACZ,CAAC,EACD;;;;;;;;;sCAS8B,CACjC,CAAA;IAED,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACnE,MAAM,MAAM,GAAG,IAAA,iCAAyB,EACpC,YAAY,EACZ;YACI,0BAA0B;YAC1B,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;YAChC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;SAClC,EACD,EAAE,CACL,CAAA;QAED,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE;YAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;YAChC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;SAClC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iFAAiF,EAAE,GAAG,EAAE;QACvF,MAAM,MAAM,GAAG,IAAA,iCAAyB,EACpC,YAAY,EACZ;YACI,0BAA0B;YAC1B,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;YAChC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;SAClC,EACD,CAAC,CACJ,CAAA;QAED,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE;YAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;YAChC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;SAClC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACvD,MAAM,MAAM,GAAG,IAAA,iCAAyB,EACpC,YAAY,EACZ;YACI,gCAAgC;YAChC,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;YAChC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;SACjC,EACD,EAAE,CACL,CAAA;QAED,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE;YAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;YAChC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;SAClC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACvD,MAAM,MAAM,GAAG,IAAA,iCAAyB,EACpC,YAAY,EACZ;YACI,mDAAmD;YACnD,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;YACjC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;SAClC,EACD,EAAE,CACL,CAAA;QAED,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE;YAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;YACjC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;SAClC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACrD,MAAM,MAAM,GAAG,IAAA,iCAAyB,EACpC,YAAY,EACZ;YACI,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;YAChC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;SAClC,EACD,EAAE,CACL,CAAA;QAED,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE;YAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;YAChC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;SAClC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}

package/out/language-server/chat/utils.d.ts

@@ -0,0 +1,4 @@
+import { EditorState, GenerateAssistantResponseCommandInput } from '@amzn/codewhisperer-streaming';
+import { ChatParams } from '@aws/language-server-runtimes/server-interface';
+import { Result } from '../types';
+export declare function convertChatParamsToRequestInput(params: ChatParams, editorState?: EditorState): Result<GenerateAssistantResponseCommandInput, string>;

package/out/language-server/chat/utils.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertChatParamsToRequestInput = void 0;
+const codewhisperer_streaming_1 = require("@amzn/codewhisperer-streaming");
+function convertChatParamsToRequestInput(params, editorState) {
+    const { prompt } = params;
+    if (prompt.prompt || prompt.escapedPrompt) {
+        // TODO: implement userInputMessageContext state when that is available, and diagnostic trigger type
+        return {
+            success: true,
+            data: {
+                conversationState: {
+                    chatTriggerType: codewhisperer_streaming_1.ChatTriggerType.MANUAL,
+                    currentMessage: {
+                        userInputMessage: {
+                            content: prompt.escapedPrompt ?? prompt.prompt,
+                            userInputMessageContext: editorState
+                                ? {
+                                    editorState,
+                                }
+                                : undefined,
+                        },
+                    },
+                },
+            },
+        };
+    }
+    return {
+        success: false,
+        error: 'Invalid request input',
+    };
+}
+exports.convertChatParamsToRequestInput = convertChatParamsToRequestInput;
+//# sourceMappingURL=utils.js.map

package/out/language-server/chat/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/language-server/chat/utils.ts"],"names":[],"mappings":";;;AAAA,2EAAmH;AAInH,SAAgB,+BAA+B,CAC3C,MAAkB,EAClB,WAAyB;IAEzB,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;IAEzB,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACxC,oGAAoG;QACpG,OAAO;YACH,OAAO,EAAE,IAAI;YACb,IAAI,EAAE;gBACF,iBAAiB,EAAE;oBACf,eAAe,EAAE,yCAAe,CAAC,MAAM;oBACvC,cAAc,EAAE;wBACZ,gBAAgB,EAAE;4BACd,OAAO,EAAE,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,MAAM;4BAC9C,uBAAuB,EAAE,WAAW;gCAChC,CAAC,CAAC;oCACI,WAAW;iCACd;gCACH,CAAC,CAAC,SAAS;yBAClB;qBACJ;iBACJ;aACJ;SACJ,CAAA;IACL,CAAC;IAED,OAAO;QACH,OAAO,EAAE,KAAK;QACd,KAAK,EAAE,uBAAuB;KACjC,CAAA;AACL,CAAC;AAhCD,0EAgCC"}

package/out/language-server/codeWhispererSecurityScanServer.d.ts

@@ -1,3 +1,3 @@
-import { Server, CredentialsProvider } from '@aws/language-server-runtimes/server-interface';
+import { CredentialsProvider, Server } from '@aws/language-server-runtimes/server-interface';
 import { CodeWhispererServiceToken } from './codeWhispererService';
 export declare const SecurityScanServerToken: (service: (credentialsProvider: CredentialsProvider) => CodeWhispererServiceToken) => Server;

package/out/language-server/codeWhispererSecurityScanServer.js

@@ -1,21 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecurityScanServerToken = void 0;
+const perf_hooks_1 = require("perf_hooks");
 const url_1 = require("url");
 const dependencyGraphFactory_1 = require("./dependencyGraph/dependencyGraphFactory");
 const languageDetection_1 = require("./languageDetection");
 const securityScanDiagnosticsProvider_1 = require("./securityScan/securityScanDiagnosticsProvider");
 const securityScanHandler_1 = require("./securityScan/securityScanHandler");
 const utils_1 = require("./utils");
+const RunSecurityScanCommand = 'aws/codewhisperer/runSecurityScan';
+const CancelSecurityScanCommand = 'aws/codewhisperer/cancelSecurityScan';
 const SecurityScanServerToken = (service) => ({ credentialsProvider, workspace, logging, lsp, telemetry }) => {
     const codewhispererclient = service(credentialsProvider);
     const diagnosticsProvider = new securityScanDiagnosticsProvider_1.default(lsp, logging);
     const scanHandler = new securityScanHandler_1.SecurityScanHandler(codewhispererclient, workspace, logging);
     const runSecurityScan = async (params, token) => {
         logging.log(`Starting security scan`);
-        diagnosticsProvider.resetDiagnostics();
+        await diagnosticsProvider.resetDiagnostics();
         let jobStatus;
-        const securityScanStartTime = performance.now();
+        const securityScanStartTime = perf_hooks_1.performance.now();
         let serviceInvocationStartTime = 0;
         const securityScanTelemetryEntry = {
             codewhispererCodeScanSrcPayloadBytes: 0,
@@ -28,11 +31,11 @@ const SecurityScanServerToken = (service) => ({ credentialsProvider, workspace,
             result: 'Succeeded',
             codewhispererCodeScanTotalIssues: 0,
             codewhispererCodeScanIssuesWithFixes: 0,
-            credentialStartUrl: credentialsProvider.getConnectionMetadata()?.sso?.startUrl ?? undefined,
+            credentialStartUrl: credentialsProvider.getConnectionMetadata?.()?.sso?.startUrl ?? undefined,
         };
         try {
             if (!credentialsProvider.hasCredentials('bearer')) {
-                throw new Error('credentialsrProvider does not have bearer token credentials');
+                throw new Error('credentialsProvider does not have bearer token credentials');
             }
             if (!params.arguments || params.arguments.length === 0) {
                 throw new Error(`Incorrect params provided. Params: ${params}`);
@@ -58,9 +61,9 @@ const SecurityScanServerToken = (service) => ({ credentialsProvider, workspace,
             if (dependencyGraph.exceedsSizeLimit((await workspace.fs.getFileSize(activeFilePath)).size)) {
                 throw new Error(`Selected file larger than ${dependencyGraph.getReadableSizeLimit()}. Try a different file.`);
             }
-            const contextTruncationStartTime = performance.now();
+            const contextTruncationStartTime = perf_hooks_1.performance.now();
             const truncation = await dependencyGraph.generateTruncation(activeFilePath);
-            securityScanTelemetryEntry.contextTruncationDuration = performance.now() - contextTruncationStartTime;
+            securityScanTelemetryEntry.contextTruncationDuration = perf_hooks_1.performance.now() - contextTruncationStartTime;
             securityScanTelemetryEntry.codewhispererCodeScanSrcPayloadBytes = truncation.srcPayloadSizeInBytes;
             securityScanTelemetryEntry.codewhispererCodeScanBuildPayloadBytes = truncation.buildPayloadSizeInBytes;
             securityScanTelemetryEntry.codewhispererCodeScanSrcZipFileBytes = truncation.zipFileSizeInBytes;
@@ -70,7 +73,7 @@ const SecurityScanServerToken = (service) => ({ credentialsProvider, workspace,
             /**
              * Step 2: Get presigned Url, upload and clean up
              */
-            const uploadStartTime = performance.now();
+            const uploadStartTime = perf_hooks_1.performance.now();
             let artifactMap = {};
             try {
                 artifactMap = await scanHandler.createCodeResourcePresignedUrlHandler(truncation.zipFileBuffer);
@@ -81,13 +84,13 @@ const SecurityScanServerToken = (service) => ({ credentialsProvider, workspace,
             }
             finally {
                 await dependencyGraph.removeTmpFiles();
-                securityScanTelemetryEntry.artifactsUploadDuration = performance.now() - uploadStartTime;
+                securityScanTelemetryEntry.artifactsUploadDuration = perf_hooks_1.performance.now() - uploadStartTime;
             }
             scanHandler.throwIfCancelled(token);
             /**
              * Step 3:  Create scan job
              */
-            serviceInvocationStartTime = performance.now();
+            serviceInvocationStartTime = perf_hooks_1.performance.now();
             const scanJob = await scanHandler.createScanJob(artifactMap, document.languageId.toLowerCase());
             logging.log(`Created security scan job id: ${scanJob.jobId}`);
             securityScanTelemetryEntry.codewhispererCodeScanJobId = scanJob.jobId;
@@ -109,7 +112,7 @@ const SecurityScanServerToken = (service) => ({ credentialsProvider, workspace,
                 total: accumulator.total + current.issues.length,
                 withFixes: accumulator.withFixes + current.issues.filter(i => i.suggestedFixes.length > 0).length,
             }), { total: 0, withFixes: 0 });
-            logging.log(`Security scan totally found ${total} issues. ${withFixes} of them have fixes.`);
+            logging.log(`Security scan found ${total} issues, ${withFixes} have suggested fixes.`);
             securityScanTelemetryEntry.codewhispererCodeScanTotalIssues = total;
             securityScanTelemetryEntry.codewhispererCodeScanIssuesWithFixes = withFixes;
             scanHandler.throwIfCancelled(token);
@@ -120,8 +123,10 @@ const SecurityScanServerToken = (service) => ({ credentialsProvider, workspace,
             logging.log(`Security scan completed.`);
             truncation.scannedFiles.forEach(file => logging.log(`Scanned file: ${file}`));
             return {
-                result: {
-                    status: jobStatus,
+                status: 'Succeeded',
+                findings: {
+                    totalFindings: total,
+                    findingsWithFixes: withFixes,
                     scannedFiles: Array.from(truncation.scannedFiles.values()).join(','),
                 },
             };
@@ -131,24 +136,21 @@ const SecurityScanServerToken = (service) => ({ credentialsProvider, workspace,
                 logging.log(`Security scan has been cancelled. ${error}`);
                 securityScanTelemetryEntry.result = 'Cancelled';
                 return {
-                    result: {
-                        status: 'Cancelled',
-                    },
+                    status: 'Cancelled',
                 };
             }
             logging.log(`Security scan failed. ${error}`);
             securityScanTelemetryEntry.result = 'Failed';
+            const err = (0, utils_1.getErrorMessage)(error);
             return {
-                result: {
-                    status: 'Failed',
-                },
-                error,
+                status: 'Failed',
+                error: err,
             };
         }
         finally {
-            securityScanTelemetryEntry.duration = performance.now() - securityScanStartTime;
+            securityScanTelemetryEntry.duration = perf_hooks_1.performance.now() - securityScanStartTime;
             securityScanTelemetryEntry.codeScanServiceInvocationsDuration =
-                performance.now() - serviceInvocationStartTime;
+                perf_hooks_1.performance.now() - serviceInvocationStartTime;
             telemetry.emitMetric({
                 name: 'codewhisperer_securityScan',
                 result: securityScanTelemetryEntry.result,
@@ -159,25 +161,38 @@ const SecurityScanServerToken = (service) => ({ credentialsProvider, workspace,
     const onExecuteCommandHandler = async (params, _token) => {
         logging.log(params.command);
         switch (params.command) {
-            case 'aws/codewhisperer/runSecurityScan':
+            case RunSecurityScanCommand:
                 return runSecurityScan(params, scanHandler.tokenSource.token);
-            case 'aws/codewhisperer/cancelSecurityScan':
+            case CancelSecurityScanCommand:
                 scanHandler.cancelSecurityScan();
         }
         return;
     };
-    diagnosticsProvider.handleHover();
+    const onInitializeHandler = () => {
+        return {
+            capabilities: {
+                executeCommandProvider: {
+                    commands: [RunSecurityScanCommand, CancelSecurityScanCommand],
+                },
+            },
+        };
+    };
     lsp.onExecuteCommand(onExecuteCommandHandler);
+    lsp.addInitializer(onInitializeHandler);
     lsp.onDidChangeTextDocument(async (p) => {
         const textDocument = await workspace.getTextDocument(p.textDocument.uri);
-        const languageId = (0, languageDetection_1.getSupportedLanguageId)(textDocument);
-        if (!textDocument || !languageId || !languageDetection_1.supportedSecurityScanLanguages.includes(languageId)) {
+        const languageId = (0, languageDetection_1.getSupportedLanguageId)(textDocument, languageDetection_1.supportedSecurityScanLanguages);
+        if (!textDocument || !languageId) {
             return;
         }
         p.contentChanges.forEach(async (change) => {
             await diagnosticsProvider.validateDiagnostics(p.textDocument.uri, change);
         });
     });
+    lsp.workspace.onDidChangeWorkspaceFolders(async (event) => {
+        // clear security scan diagnostics for previous run when a workspace change event occurs
+        await diagnosticsProvider.resetDiagnostics();
+    });
     logging.log('SecurityScan server has been initialized');
     return () => {
         // dispose function