@aws/lsp-codewhisperer 0.0.82 → 0.0.84

package/out/language-server/inline-completion/utils/diffUtils.js

@@ -0,0 +1,407 @@
+"use strict";
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateUnifiedDiffWithTimestamps = generateUnifiedDiffWithTimestamps;
+exports.generateDiffContexts = generateDiffContexts;
+exports.getAddedAndDeletedLines = getAddedAndDeletedLines;
+exports.getCharacterDifferences = getCharacterDifferences;
+exports.processEditSuggestion = processEditSuggestion;
+exports.readUdiff = readUdiff;
+exports.categorizeUnifieddiff = categorizeUnifieddiff;
+exports.extractAdditions = extractAdditions;
+exports.removeOverlapCodeFromSuggestion = removeOverlapCodeFromSuggestion;
+exports.longestCommonPrefix = longestCommonPrefix;
+const diff_1 = require("diff");
+const supplementalContextUtil_1 = require("../../../shared/supplementalContextUtil/supplementalContextUtil");
+const protocol_1 = require("@aws/language-server-runtimes/protocol");
+const codeWhispererService_1 = require("../../../shared/codeWhispererService");
+const mergeRightUtils_1 = require("./mergeRightUtils");
+/**
+ * Generates a unified diff format between old and new file contents
+ *
+ * @param oldFilePath - Path to the old version of the file
+ * @param newFilePath - Path to the new version of the file
+ * @param oldContent - Content of the old version
+ * @param newContent - Content of the new version
+ * @param oldTimestamp - Timestamp of the old version
+ * @param newTimestamp - Timestamp of the new version
+ * @param contextSize - Number of context lines to include in the diff
+ * @returns Unified diff string
+ */
+function generateUnifiedDiffWithTimestamps(oldFilePath, newFilePath, oldContent, newContent, oldTimestamp, newTimestamp, contextSize = 3) {
+    const patchResult = (0, diff_1.createTwoFilesPatch)(oldFilePath, newFilePath, oldContent, newContent, String(oldTimestamp), String(newTimestamp), { context: contextSize });
+    // Remove unused headers
+    const lines = patchResult.split('\n');
+    if (lines.length >= 2 && lines[0].startsWith('Index:')) {
+        lines.splice(0, 2);
+        return lines.join('\n');
+    }
+    return patchResult;
+}
+/**
+ * Generates supplemental contexts from snapshot contents and current content
+ *
+ * @param filePath - Path to the file
+ * @param currentContent - Current content of the file
+ * @param snapshotContents - List of snapshot contents sorted by timestamp (oldest first)
+ * @param maxContexts - Maximum number of supplemental contexts to return
+ * @returns CodeWhispererSupplementalContext object containing diffs between snapshots and current content
+ */
+function generateDiffContexts(filePath, currentContent, snapshotContents, maxContexts) {
+    if (snapshotContents.length === 0) {
+        return {
+            isUtg: false,
+            isProcessTimeout: false,
+            supplementalContextItems: [],
+            contentsLength: 0,
+            latency: 0,
+            strategy: 'recentEdits',
+        };
+    }
+    const startTime = Date.now();
+    const supplementalContextItems = [];
+    const currentTimestamp = Date.now();
+    // Process snapshots from newest to oldest
+    for (let i = snapshotContents.length - 1; i >= 0; i--) {
+        const snapshot = snapshotContents[i];
+        try {
+            const unifiedDiff = generateUnifiedDiffWithTimestamps(snapshot.filePath, filePath, snapshot.content, currentContent, snapshot.timestamp, currentTimestamp);
+            // Only add non-empty diffs
+            if (unifiedDiff.trim().length > 0) {
+                supplementalContextItems.push({
+                    filePath: snapshot.filePath,
+                    content: unifiedDiff,
+                    score: 1.0, // Default score for recent edits
+                });
+            }
+        }
+        catch (err) {
+            // TODO: logging
+            // console.error(`Failed to generate diff: ${err}`)
+        }
+    }
+    const trimmedContextItems = (0, supplementalContextUtil_1.trimSupplementalContexts)(supplementalContextItems, maxContexts);
+    const contentsLength = trimmedContextItems.reduce((sum, ctx) => sum + ctx.content.length, 0);
+    const latency = Date.now() - startTime;
+    return {
+        isUtg: false,
+        isProcessTimeout: false,
+        supplementalContextItems: trimmedContextItems,
+        contentsLength,
+        latency,
+        strategy: 'recentEdits',
+    };
+}
+function getAddedAndDeletedLines(unifiedDiff) {
+    const lines = unifiedDiff.split('\n');
+    const addedLines = lines.filter(line => line.startsWith('+') && !line.startsWith('+++')).map(line => line.slice(1));
+    const deletedLines = lines
+        .filter(line => line.startsWith('-') && !line.startsWith('---'))
+        .map(line => line.slice(1));
+    return {
+        addedLines,
+        deletedLines,
+    };
+}
+/**
+ * Find longest common subsequence length between two strings
+ */
+function lcsLength(str1, str2) {
+    const m = str1.length;
+    const n = str2.length;
+    const dp = Array(m + 1)
+        .fill(null)
+        .map(() => Array(n + 1).fill(0));
+    for (let i = 1; i <= m; i++) {
+        for (let j = 1; j <= n; j++) {
+            if (str1[i - 1] === str2[j - 1]) {
+                dp[i][j] = dp[i - 1][j - 1] + 1;
+            }
+            else {
+                dp[i][j] = Math.max(dp[i - 1][j], dp[i][j - 1]);
+            }
+        }
+    }
+    return dp;
+}
+/**
+ * Calculate character differences between added and deleted blocks
+ */
+function getCharacterDifferences(addedLines, deletedLines) {
+    const addedText = addedLines.join('\n');
+    const deletedText = deletedLines.join('\n');
+    if (addedText.length === 0) {
+        return { charactersAdded: 0, charactersRemoved: deletedText.length };
+    }
+    if (deletedText.length === 0) {
+        return { charactersAdded: addedText.length, charactersRemoved: 0 };
+    }
+    const lcsTable = lcsLength(deletedText, addedText);
+    const lcsLen = lcsTable[deletedText.length][addedText.length];
+    return {
+        charactersAdded: addedText.length - lcsLen,
+        charactersRemoved: deletedText.length - lcsLen,
+    };
+}
+function processEditSuggestion(unifiedDiff, triggerPosition, document, rightContext) {
+    // Assume it's an edit if anything goes wrong, at the very least it will not be rendered incorrectly
+    let diffCategory = 'edit';
+    try {
+        diffCategory = categorizeUnifieddiff(unifiedDiff, triggerPosition.line);
+    }
+    catch (e) {
+        // We dont have logger here....
+        diffCategory = 'edit';
+    }
+    if (diffCategory === 'addOnly') {
+        const preprocessAdd = extractAdditions(unifiedDiff);
+        const leftContextAtTriggerLine = document.getText(protocol_1.Range.create(protocol_1.Position.create(triggerPosition.line, 0), triggerPosition));
+        /**
+         * SHOULD NOT remove the entire overlapping string, the way inline suggestion prefix matching work depends on where it triggers
+         * For example (^ note where user triggers)
+         * console.lo
+         *        ^
+         * if LSP returns `g('foo')` instead of `.log()` the suggestion will be discarded because prefix doesnt match
+         */
+        const processedAdd = removeOverlapCodeFromSuggestion(leftContextAtTriggerLine, preprocessAdd);
+        const mergedWithRightContext = (0, mergeRightUtils_1.truncateOverlapWithRightContext)(rightContext, processedAdd);
+        return {
+            suggestionContent: mergedWithRightContext,
+            type: codeWhispererService_1.SuggestionType.COMPLETION,
+        };
+    }
+    else {
+        return {
+            suggestionContent: unifiedDiff,
+            type: codeWhispererService_1.SuggestionType.EDIT,
+        };
+    }
+}
+// TODO: refine
+function readUdiff(unifiedDiff) {
+    let hunk;
+    try {
+        const patches = (0, diff_1.parsePatch)(unifiedDiff);
+        if (patches.length !== 1) {
+            throw new Error(`Provided unified diff from has 0 or more than 1 patches`);
+        }
+        hunk = patches[0].hunks[0];
+        if (!hunk) {
+            throw new Error(`Null hunk`);
+        }
+    }
+    catch (e) {
+        throw e;
+    }
+    // TODO: Should use hunk instead of parsing manually
+    const lines = unifiedDiff.split('\n');
+    const headerEndIndex = lines.findIndex(l => l.startsWith('@@'));
+    if (headerEndIndex === -1) {
+        throw new Error('not able to parse');
+    }
+    const relevantLines = lines.slice(headerEndIndex + 1);
+    if (relevantLines.length === 0) {
+        throw new Error('not able to parse');
+    }
+    const minusIndexes = [];
+    const plusIndexes = [];
+    for (let i = 0; i < relevantLines.length; i++) {
+        const l = relevantLines[i];
+        if (l.startsWith('-')) {
+            minusIndexes.push(i);
+        }
+        else if (l.startsWith('+')) {
+            plusIndexes.push(i);
+        }
+    }
+    const firstMinusIndex = relevantLines.findIndex(s => s.startsWith('-'));
+    const firstPlusIndex = relevantLines.findIndex(s => s.startsWith('+'));
+    // TODO: Comment these out as they are used for a different version of addonly type determination logic in case the current implementation doesn't work.
+    // Could remove later if we are sure current imple works.
+    /**
+     * Concatenate all contiguous added lines (i.e., unbroken sequence of "+"s).
+     * Exclude all newlines when concatenating, so we get a single line representing the new text
+     */
+    // let singleLine = ''
+    // let prev: number | undefined
+    // for (const idx of plusIndexes) {
+    //     if (!prev || idx === prev + 1) {
+    //         const removedPlus = relevantLines[idx].substring(1)
+    //         const removedStartNewline = trimStartNewline(removedPlus)
+    //         singleLine += removedStartNewline
+    //     } else {
+    //         break
+    //     }
+    // }
+    return {
+        linesWithoutHeaders: relevantLines,
+        firstMinusIndex: firstMinusIndex,
+        firstPlusIndex: firstPlusIndex,
+        minusIndexes: minusIndexes,
+        plusIndexes: plusIndexes,
+        hunk: hunk,
+    };
+}
+// Theoretically, we should always pass userTriggerAtLine, keeping it nullable for easier testing for now
+function categorizeUnifieddiff(unifiedDiff, userTriggerAtLine) {
+    try {
+        const d = readUdiff(unifiedDiff);
+        const hunk = d.hunk;
+        const firstMinusIndex = d.firstMinusIndex;
+        const firstPlusIndex = d.firstPlusIndex;
+        const diffWithoutHeaders = d.linesWithoutHeaders;
+        // Shouldn't be the case but if there is no - nor +, assume it's an edit
+        if (firstMinusIndex === -1 && firstPlusIndex === -1) {
+            return 'edit';
+        }
+        // If first "EDIT" line is not where users trigger, it must be EDIT
+        // Note hunk.start is 1 based index
+        const firstLineEdited = hunk.oldStart - 1 + Math.min(...d.minusIndexes, ...d.plusIndexes);
+        if (userTriggerAtLine !== undefined && userTriggerAtLine !== firstLineEdited) {
+            return 'edit';
+        }
+        // Naive case, only +
+        if (firstMinusIndex === -1 && firstPlusIndex !== -1) {
+            return 'addOnly';
+        }
+        // Naive case, only -
+        if (firstMinusIndex !== -1 && firstPlusIndex === -1) {
+            return 'deleteOnly';
+        }
+        const minusIndexes = d.minusIndexes;
+        const plusIndexes = d.plusIndexes;
+        // If there are multiple (> 1) non empty '-' lines, it must be edit
+        const c = minusIndexes.reduce((acc, cur) => {
+            if (diffWithoutHeaders[cur].trim().length > 0) {
+                return acc++;
+            }
+            return acc;
+        }, 0);
+        if (c > 1) {
+            return 'edit';
+        }
+        // If last '-' line is followed by '+' block, it could be addonly
+        if (plusIndexes[0] === minusIndexes[minusIndexes.length - 1] + 1) {
+            /**
+            -------------------------------
+            -  return
+            +  return a - b;
+            -------------------------------
+            commonPrefix = "return "
+            minusLinesDelta = ""
+
+            --------------------------------
+            -\t\t\t
+            +\treturn a - b;
+            --------------------------------
+            commonPrefix = "\t"
+            minusLinesDelta = "\t\t"
+
+             *
+             *
+             *
+             */
+            const minusLine = diffWithoutHeaders[minusIndexes[minusIndexes.length - 1]].substring(1);
+            const pluscode = extractAdditions(unifiedDiff);
+            // If minusLine subtract the longest common substring of minusLine and plugcode and it's empty string, it's addonly
+            const commonPrefix = longestCommonPrefix(minusLine, pluscode);
+            const minusLinesDelta = minusLine.substring(commonPrefix.length);
+            if (minusLinesDelta.trim().length === 0) {
+                return 'addOnly';
+            }
+            /**
+            -------------------------------
+             -  return a * b;
+             +  return a * b * c;
+            -------------------------------
+            commonPrefix = "return a * b"
+            minusLinesDelta = ";"
+            pluscodeDelta = " * c;"
+             *
+             */
+            const pluscodeDelta = pluscode.substring(commonPrefix.length);
+            if (pluscodeDelta.endsWith(minusLinesDelta)) {
+                return 'addOnly';
+            }
+        }
+        return 'edit';
+    }
+    catch (e) {
+        return 'edit';
+    }
+}
+// TODO: current implementation here assumes service only return 1 chunk of edits (consecutive lines) and hacky
+function extractAdditions(unifiedDiff) {
+    const lines = unifiedDiff.split('\n');
+    let completionSuggestion = '';
+    let isInAdditionBlock = false;
+    for (const line of lines) {
+        // Skip diff headers (files)
+        if (line.startsWith('+++') || line.startsWith('---')) {
+            continue;
+        }
+        // Skip hunk headers (@@ lines)
+        if (line.startsWith('@@')) {
+            continue;
+        }
+        // Handle additions
+        if (line.startsWith('+')) {
+            completionSuggestion += line.substring(1) + '\n';
+            isInAdditionBlock = true;
+        }
+        else if (isInAdditionBlock && !line.startsWith('+')) {
+            // End of addition block
+            isInAdditionBlock = false;
+        }
+    }
+    // Remove trailing newline
+    return completionSuggestion.trimEnd();
+}
+/**
+ *
+ * example
+ * code = 'return'
+ * suggestion = 'return a + b;'
+ * output = ' a + b;'
+ */
+function removeOverlapCodeFromSuggestion(code, suggestion) {
+    const suggestionLines = suggestion.split('\n');
+    const firstLineSuggestion = suggestionLines[0];
+    // Find the common string in code surfix and prefix of suggestion
+    const s = (0, mergeRightUtils_1.getPrefixSuffixOverlap)(code, firstLineSuggestion);
+    // Remove overlap s from suggestion
+    return suggestion.substring(s.length);
+}
+function longestCommonPrefix(str1, str2) {
+    const minLength = Math.min(str1.length, str2.length);
+    let prefix = '';
+    for (let i = 0; i < minLength; i++) {
+        if (str1[i] === str2[i]) {
+            prefix += str1[i];
+        }
+        else {
+            break;
+        }
+    }
+    return prefix;
+}
+// TODO: They are used for a different version of addonly type determination logic in case the current implementation doesn't work.
+// Could remove later if we are sure current impl works.
+// function trimStartNewline(str: string): string {
+//     return str.replace(/^[\n\r]+/, '')
+// }
+// function hasOneContiguousInsert(original: string, changed: string) {
+//     const delta = changed.length - original.length
+//     if (delta <= 0) {
+//         // Changed string must be longer
+//         return false
+//     }
+//     let p, s
+//     for (p = 0; original[p] === changed[p] && p < original.length; ++p);
+//     for (s = original.length - 1; original[s] === changed[s + delta] && s >= 0; --s);
+//     return p === s + 1
+// }
+//# sourceMappingURL=diffUtils.js.map

package/out/language-server/inline-completion/utils/diffUtils.js.map

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

package/out/language-server/inline-completion/utils/mergeRightUtils.d.ts

@@ -0,0 +1,9 @@
+import { InlineCompletionItemWithReferences, Range } from '@aws/language-server-runtimes/server-interface';
+import { Suggestion } from '../../../shared/codeWhispererService';
+/**
+ * Returns the longest overlap between the Suffix of firstString and Prefix of second string
+ * getPrefixSuffixOverlap("adwg31", "31ggrs") = "31"
+ */
+export declare function getPrefixSuffixOverlap(firstString: string, secondString: string): string;
+export declare function truncateOverlapWithRightContext(rightFileContent: string, suggestion: string): string;
+export declare const mergeSuggestionsWithRightContext: (rightFileContext: string, suggestions: Suggestion[], includeImportsWithSuggestions: boolean, range?: Range) => InlineCompletionItemWithReferences[];

package/out/language-server/inline-completion/utils/mergeRightUtils.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeSuggestionsWithRightContext = void 0;
+exports.getPrefixSuffixOverlap = getPrefixSuffixOverlap;
+exports.truncateOverlapWithRightContext = truncateOverlapWithRightContext;
+/**
+ * Returns the longest overlap between the Suffix of firstString and Prefix of second string
+ * getPrefixSuffixOverlap("adwg31", "31ggrs") = "31"
+ */
+function getPrefixSuffixOverlap(firstString, secondString) {
+    let i = Math.min(firstString.length, secondString.length);
+    while (i > 0) {
+        if (secondString.slice(0, i) === firstString.slice(-i)) {
+            break;
+        }
+        i--;
+    }
+    return secondString.slice(0, i);
+}
+function truncateOverlapWithRightContext(rightFileContent, suggestion) {
+    const trimmedSuggestion = suggestion.trim();
+    // limit of 5000 for right context matching
+    const rightContext = rightFileContent
+        .substring(0, 5000)
+        .replaceAll('\r\n', '\n')
+        .replace(/^[^\S\n]+/, ''); // remove leading tabs and whitespaces
+    const overlap = getPrefixSuffixOverlap(trimmedSuggestion, rightContext);
+    const overlapIndex = suggestion.lastIndexOf(overlap);
+    if (overlapIndex >= 0) {
+        const truncated = suggestion.slice(0, overlapIndex);
+        return truncated.trim().length ? truncated : '';
+    }
+    else {
+        return suggestion;
+    }
+}
+const mergeSuggestionsWithRightContext = (rightFileContext, suggestions, includeImportsWithSuggestions, range) => {
+    return suggestions.map(suggestion => {
+        const insertText = truncateOverlapWithRightContext(rightFileContext, suggestion.content);
+        let references = suggestion.references
+            ?.filter(ref => !(ref.recommendationContentSpan?.start && insertText.length <= ref.recommendationContentSpan.start) && insertText.length)
+            .map(r => {
+            return {
+                licenseName: r.licenseName,
+                referenceUrl: r.url,
+                referenceName: r.repository,
+                position: r.recommendationContentSpan && {
+                    startCharacter: r.recommendationContentSpan.start,
+                    endCharacter: r.recommendationContentSpan.end
+                        ? Math.min(r.recommendationContentSpan.end, insertText.length - 1)
+                        : r.recommendationContentSpan.end,
+                },
+            };
+        });
+        return {
+            itemId: suggestion.itemId,
+            insertText: insertText,
+            range,
+            references: references?.length ? references : undefined,
+            mostRelevantMissingImports: includeImportsWithSuggestions
+                ? suggestion.mostRelevantMissingImports
+                : undefined,
+        };
+    });
+};
+exports.mergeSuggestionsWithRightContext = mergeSuggestionsWithRightContext;
+//# sourceMappingURL=mergeRightUtils.js.map

package/out/language-server/inline-completion/utils/mergeRightUtils.js.map

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

package/out/language-server/inline-completion/utils/textDocumentUtils.d.ts

@@ -0,0 +1,3 @@
+import { TextDocument } from '@aws/language-server-runtimes/server-interface';
+export declare const getLanguageIdFromUri: (uri: string, logging?: any) => string;
+export declare const getTextDocument: (uri: string, workspace: any, logging: any) => Promise<TextDocument | undefined>;

package/out/language-server/inline-completion/utils/textDocumentUtils.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTextDocument = exports.getLanguageIdFromUri = void 0;
+const server_interface_1 = require("@aws/language-server-runtimes/server-interface");
+const constants_1 = require("../contants/constants");
+const vscode_uri_1 = require("vscode-uri");
+const getLanguageIdFromUri = (uri, logging) => {
+    try {
+        if (uri.startsWith('vscode-notebook-cell:')) {
+            // use python for now as lsp does not support JL cell language detection
+            return 'python';
+        }
+        const extension = uri.split('.').pop()?.toLowerCase();
+        return constants_1.ABAP_EXTENSIONS.has(extension || '') ? 'abap' : '';
+    }
+    catch (err) {
+        logging?.log(`Error parsing URI to determine language: ${uri}: ${err}`);
+        return '';
+    }
+};
+exports.getLanguageIdFromUri = getLanguageIdFromUri;
+const getTextDocument = async (uri, workspace, logging) => {
+    let textDocument = await workspace.getTextDocument(uri);
+    if (!textDocument) {
+        try {
+            const content = await workspace.fs.readFile(vscode_uri_1.URI.parse(uri).fsPath);
+            const languageId = (0, exports.getLanguageIdFromUri)(uri);
+            textDocument = server_interface_1.TextDocument.create(uri, languageId, 0, content);
+        }
+        catch (err) {
+            logging.log(`Unable to load from ${uri}: ${err}`);
+        }
+    }
+    return textDocument;
+};
+exports.getTextDocument = getTextDocument;
+//# sourceMappingURL=textDocumentUtils.js.map

package/out/language-server/inline-completion/utils/textDocumentUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"textDocumentUtils.js","sourceRoot":"","sources":["../../../../src/language-server/inline-completion/utils/textDocumentUtils.ts"],"names":[],"mappings":";;;AAAA,qFAA6E;AAC7E,qDAAuD;AACvD,2CAAgC;AAEzB,MAAM,oBAAoB,GAAG,CAAC,GAAW,EAAE,OAAa,EAAU,EAAE;IACvE,IAAI,CAAC;QACD,IAAI,GAAG,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAAE,CAAC;YAC1C,wEAAwE;YACxE,OAAO,QAAQ,CAAA;QACnB,CAAC;QACD,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,CAAA;QACrD,OAAO,2BAAe,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;IAC7D,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,OAAO,EAAE,GAAG,CAAC,4CAA4C,GAAG,KAAK,GAAG,EAAE,CAAC,CAAA;QACvE,OAAO,EAAE,CAAA;IACb,CAAC;AACL,CAAC,CAAA;AAZY,QAAA,oBAAoB,wBAYhC;AAEM,MAAM,eAAe,GAAG,KAAK,EAAE,GAAW,EAAE,SAAc,EAAE,OAAY,EAAqC,EAAE;IAClH,IAAI,YAAY,GAAG,MAAM,SAAS,CAAC,eAAe,CAAC,GAAG,CAAC,CAAA;IACvD,IAAI,CAAC,YAAY,EAAE,CAAC;QAChB,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,gBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAA;YAClE,MAAM,UAAU,GAAG,IAAA,4BAAoB,EAAC,GAAG,CAAC,CAAA;YAC5C,YAAY,GAAG,+BAAY,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,CAAC,EAAE,OAAO,CAAC,CAAA;QACnE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,uBAAuB,GAAG,KAAK,GAAG,EAAE,CAAC,CAAA;QACrD,CAAC;IACL,CAAC;IACD,OAAO,YAAY,CAAA;AACvB,CAAC,CAAA;AAZY,QAAA,eAAe,mBAY3B"}

package/out/language-server/inline-completion/{trigger.d.ts → utils/triggerUtils.d.ts}

@@ -1,8 +1,8 @@
-import { SessionManager } from './session/sessionManager';
+import { SessionManager } from '../session/sessionManager';
 import { InlineCompletionWithReferencesParams } from '@aws/language-server-runtimes/protocol';
-import { CursorTracker } from './tracker/cursorTracker';
-import { RecentEditTracker } from './tracker/codeEditTracker';
-import { CodeWhispererServiceBase, ClientFileContext } from '../../shared/codeWhispererService';
+import { CursorTracker } from '../tracker/cursorTracker';
+import { RecentEditTracker } from '../tracker/codeEditTracker';
+import { CodeWhispererServiceBase, ClientFileContext } from '../../../shared/codeWhispererService';
 export declare class NepTrigger {
 }
 export declare function shouldTriggerEdits(service: CodeWhispererServiceBase, fileContext: ClientFileContext, inlineParams: InlineCompletionWithReferencesParams, cursorTracker: CursorTracker, recentEditsTracker: RecentEditTracker, sessionManager: SessionManager, editsEnabled: boolean): NepTrigger | undefined;

package/out/language-server/inline-completion/{trigger.js → utils/triggerUtils.js}

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NepTrigger = void 0;
 exports.shouldTriggerEdits = shouldTriggerEdits;
-const editPredictionAutoTrigger_1 = require("./auto-trigger/editPredictionAutoTrigger");
-const codeWhispererService_1 = require("../../shared/codeWhispererService");
+const editPredictionAutoTrigger_1 = require("../auto-trigger/editPredictionAutoTrigger");
+const codeWhispererService_1 = require("../../../shared/codeWhispererService");
 class NepTrigger {
 }
 exports.NepTrigger = NepTrigger;
@@ -39,4 +39,4 @@ function shouldTriggerEdits(service, fileContext, inlineParams, cursorTracker, r
         return undefined;
     }
 }
-//# sourceMappingURL=trigger.js.map
+//# sourceMappingURL=triggerUtils.js.map

package/out/language-server/inline-completion/utils/triggerUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"triggerUtils.js","sourceRoot":"","sources":["../../../../src/language-server/inline-completion/utils/triggerUtils.ts"],"names":[],"mappings":";;;AAaA,gDA2CC;AAtDD,yFAAqF;AAGrF,+EAI6C;AAE7C,MAAa,UAAU;CAAG;AAA1B,gCAA0B;AAE1B,SAAgB,kBAAkB,CAC9B,OAAiC,EACjC,WAA8B,EAC9B,YAAkD,EAClD,aAA4B,EAC5B,kBAAqC,EACrC,cAA8B,EAC9B,YAAqB;IAErB,IAAI,CAAC,YAAY,EAAE,CAAC;QAChB,OAAO,SAAS,CAAA;IACpB,CAAC;IACD,0IAA0I;IAC1I,IAAI,CAAC,CAAC,OAAO,YAAY,gDAAyB,CAAC,EAAE,CAAC;QAClD,OAAO,SAAS,CAAA;IACpB,CAAC;IAED,MAAM,oBAAoB,GAAG,YAAY,CAAC,oBAAoB,CAAA;IAC9D,MAAM,mBAAmB,GACrB,oBAAoB,EAAE,cAAc;QACpC,oBAAoB,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC;QAC9C,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAA;IAE7D,wFAAwF;IACxF,MAAM,iBAAiB,GAAG,mBAAmB;QACzC,CAAC,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI;QAC7C,CAAC,CAAC,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;IAEvD,MAAM,gBAAgB,GAAG,cAAc,CAAC,kBAAkB,EAAE,EAAE,gCAAgC,EAAE,CAAA;IAChG,MAAM,GAAG,GAAG,IAAA,qDAAyB,EAAC;QAClC,WAAW,EAAE,WAAW;QACxB,OAAO,EAAE,YAAY,CAAC,QAAQ,CAAC,IAAI;QACnC,IAAI,EAAE,iBAAiB;QACvB,gBAAgB,EAAE,gBAAgB,IAAI,EAAE;QACxC,aAAa,EAAE,aAAa;QAC5B,WAAW,EAAE,kBAAkB;KAClC,CAAC,CAAA;IAEF,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;QACpB,OAAO,IAAI,UAAU,EAAE,CAAA;IAC3B,CAAC;SAAM,CAAC;QACJ,OAAO,SAAS,CAAA;IACpB,CAAC;AACL,CAAC"}

package/out/language-server/netTransform/artifactManager.d.ts

@@ -1,5 +1,5 @@
 import { Logging, Workspace } from '@aws/language-server-runtimes/server-interface';
-import { ExternalReference, References, RequirementJson, StartTransformRequest, TransformationPreferences } from './models';
+import { References, RequirementJson, StartTransformRequest, TransformationPreferences } from './models';
 export declare class ArtifactManager {
     private workspace;
     private logging;
@@ -14,7 +14,7 @@ export declare class ArtifactManager {
     copySolutionConfigFiles(request: StartTransformRequest): Promise<void>;
     copySourceFile(solutionRootPath: string, filePath: string): Promise<void>;
     createRequirementJsonContent(request: StartTransformRequest): Promise<RequirementJson>;
-    processPrivatePackages(request: StartTransformRequest, reference: ExternalReference, artifactReference: References): Promise<void>;
+    processPrivatePackages(request: StartTransformRequest, artifactReference: References): Promise<void>;
     zipArtifact(): Promise<string>;
     static getSha256Async(fileName: string): Promise<string>;
     getRequirementJsonPath(): string;