@aws/lsp-codewhisperer 0.0.48 → 0.0.50

package/out/language-server/inline-completion/auto-trigger/languageDetector.js

@@ -0,0 +1,353 @@
+"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.LanguageDetectorFactory = void 0;
+/**
+ * Factory for creating language-specific detectors
+ */
+class LanguageDetectorFactory {
+    static detectors = new Map();
+    /**
+     * Get a language detector for the specified language
+     */
+    static getDetector(language) {
+        const normalizedLanguage = language.toLowerCase();
+        if (!this.detectors.has(normalizedLanguage)) {
+            switch (normalizedLanguage) {
+                case 'java':
+                    this.detectors.set(normalizedLanguage, new JavaLanguageDetector());
+                    break;
+                case 'python':
+                    this.detectors.set(normalizedLanguage, new PythonLanguageDetector());
+                    break;
+                case 'javascript':
+                case 'typescript':
+                    this.detectors.set(normalizedLanguage, new JavaScriptLanguageDetector());
+                    break;
+                default:
+                    // Default to a generic detector for unsupported languages
+                    this.detectors.set(normalizedLanguage, new GenericLanguageDetector());
+            }
+        }
+        return this.detectors.get(normalizedLanguage);
+    }
+}
+exports.LanguageDetectorFactory = LanguageDetectorFactory;
+/**
+ * Base class for language detectors with common functionality
+ */
+class BaseLanguageDetector {
+    isAfterKeyword(lineContent) {
+        const trimmedContent = lineContent.trim();
+        const words = trimmedContent.split(/\s+/);
+        const lastWord = words[words.length - 1];
+        return this.getKeywords().includes(lastWord);
+    }
+    isAfterOperatorOrDelimiter(lineContent) {
+        if (lineContent.length === 0) {
+            return false;
+        }
+        const lastChar = lineContent[lineContent.length - 1];
+        return this.getOperatorsAndDelimiters().includes(lastChar);
+    }
+    isAtLineBeginning(lineContent) {
+        return lineContent.trim().length === 0;
+    }
+}
+/**
+ * Java language detector implementation
+ */
+class JavaLanguageDetector extends BaseLanguageDetector {
+    getKeywords() {
+        return [
+            'abstract',
+            'assert',
+            'boolean',
+            'break',
+            'byte',
+            'case',
+            'catch',
+            'char',
+            'class',
+            'const',
+            'continue',
+            'default',
+            'do',
+            'double',
+            'else',
+            'enum',
+            'extends',
+            'final',
+            'finally',
+            'float',
+            'for',
+            'if',
+            'goto',
+            'implements',
+            'import',
+            'instanceof',
+            'int',
+            'interface',
+            'long',
+            'native',
+            'new',
+            'package',
+            'private',
+            'protected',
+            'public',
+            'return',
+            'short',
+            'static',
+            'strictfp',
+            'super',
+            'switch',
+            'synchronized',
+            'this',
+            'throw',
+            'throws',
+            'transient',
+            'try',
+            'void',
+            'volatile',
+            'while',
+        ];
+    }
+    getOperatorsAndDelimiters() {
+        return [
+            '=',
+            '==',
+            '!=',
+            '<',
+            '>',
+            '<=',
+            '>=',
+            '+',
+            '-',
+            '*',
+            '/',
+            '%',
+            '++',
+            '--',
+            '&',
+            '|',
+            '^',
+            '~',
+            '<<',
+            '>>',
+            '>>>',
+            '&&',
+            '||',
+            '!',
+            '?',
+            ':',
+            '(',
+            '{',
+            '[',
+            '.',
+            ';',
+            '}',
+        ];
+    }
+}
+/**
+ * Python language detector implementation
+ */
+class PythonLanguageDetector extends BaseLanguageDetector {
+    getKeywords() {
+        return [
+            'and',
+            'as',
+            'assert',
+            'async',
+            'await',
+            'break',
+            'class',
+            'continue',
+            'def',
+            'del',
+            'elif',
+            'else',
+            'except',
+            'False',
+            'finally',
+            'for',
+            'from',
+            'global',
+            'if',
+            'import',
+            'in',
+            'is',
+            'lambda',
+            'None',
+            'nonlocal',
+            'not',
+            'or',
+            'pass',
+            'raise',
+            'return',
+            'True',
+            'try',
+            'while',
+            'with',
+            'yield',
+        ];
+    }
+    getOperatorsAndDelimiters() {
+        return [
+            '+',
+            '-',
+            '*',
+            '**',
+            '/',
+            '//',
+            '%',
+            '@',
+            '<<',
+            '>>',
+            '&',
+            '|',
+            '^',
+            '~',
+            '<',
+            '>',
+            '<=',
+            '>=',
+            '==',
+            '!=',
+            '=',
+            '+=',
+            '-=',
+            '*=',
+            '/=',
+            '%=',
+            '@=',
+            '&=',
+            '|=',
+            '^=',
+            '<<=',
+            '>>=',
+            '**=',
+            '//=',
+            '(',
+            '{',
+            '[',
+            '.',
+            ':',
+            ';',
+            '}',
+            ']',
+            ')',
+        ];
+    }
+}
+/**
+ * JavaScript language detector implementation
+ */
+class JavaScriptLanguageDetector extends BaseLanguageDetector {
+    getKeywords() {
+        return [
+            'await',
+            'break',
+            'case',
+            'catch',
+            'class',
+            'const',
+            'continue',
+            'debugger',
+            'default',
+            'delete',
+            'do',
+            'else',
+            'enum',
+            'export',
+            'extends',
+            'false',
+            'finally',
+            'for',
+            'function',
+            'if',
+            'implements',
+            'import',
+            'in',
+            'instanceof',
+            'interface',
+            'let',
+            'new',
+            'null',
+            'package',
+            'private',
+            'protected',
+            'public',
+            'return',
+            'super',
+            'switch',
+            'static',
+            'this',
+            'throw',
+            'true',
+            'try',
+            'typeof',
+            'var',
+            'void',
+            'while',
+            'with',
+            'yield',
+        ];
+    }
+    getOperatorsAndDelimiters() {
+        return [
+            '=',
+            '==',
+            '===',
+            '!=',
+            '!==',
+            '<',
+            '>',
+            '<=',
+            '>=',
+            '+',
+            '-',
+            '*',
+            '/',
+            '%',
+            '++',
+            '--',
+            '&',
+            '|',
+            '^',
+            '~',
+            '<<',
+            '>>',
+            '>>>',
+            '&&',
+            '||',
+            '!',
+            '?',
+            ':',
+            '(',
+            '{',
+            '[',
+            '.',
+            ';',
+            '=>',
+            '}',
+            ']',
+            ')',
+        ];
+    }
+}
+/**
+ * Generic language detector implementation for unsupported languages
+ */
+class GenericLanguageDetector extends BaseLanguageDetector {
+    getKeywords() {
+        return [];
+    }
+    getOperatorsAndDelimiters() {
+        return ['=', '+', '-', '*', '/', '%', '<', '>', '!', '&', '|', '^', '~', '(', '{', '[', '.', ':', ';', ','];
+    }
+}
+//# sourceMappingURL=languageDetector.js.map

package/out/language-server/inline-completion/auto-trigger/languageDetector.js.map

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

package/out/language-server/inline-completion/diffUtils.d.ts

@@ -0,0 +1,50 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { CodeWhispererSupplementalContext } from '../../shared/models/model';
+/**
+ * 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
+ */
+export declare function generateUnifiedDiffWithTimestamps(oldFilePath: string, newFilePath: string, oldContent: string, newContent: string, oldTimestamp: number, newTimestamp: number, contextSize?: number): string;
+/**
+ * Represents a snapshot content of a file at a specific point in time
+ */
+export interface FileSnapshotContent {
+    /** URI of the file */
+    readonly filePath: string;
+    /** Content of the file */
+    readonly content: string;
+    /** Timestamp when the snapshot was taken */
+    readonly timestamp: number;
+}
+/**
+ * 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
+ */
+export declare function generateDiffContexts(filePath: string, currentContent: string, snapshotContents: FileSnapshotContent[], maxContexts: number): CodeWhispererSupplementalContext;
+/** src: https://github.com/aws/aws-toolkit-vscode/blob/3921457b0a2094b831beea0d66cc2cbd2a833890/packages/amazonq/src/app/inline/EditRendering/diffUtils.ts#L18
+ * Apply a unified diff to original code to generate modified code
+ * @param originalCode The original code as a string
+ * @param unifiedDiff The unified diff content
+ * @returns The modified code after applying the diff
+ */
+export declare function applyUnifiedDiff(docText: string, unifiedDiff: string): string;
+export declare function getAddedAndDeletedChars(unifiedDiff: string): {
+    addedCharacters: string;
+    deletedCharacters: string;
+};

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

@@ -0,0 +1,202 @@
+"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.applyUnifiedDiff = applyUnifiedDiff;
+exports.getAddedAndDeletedChars = getAddedAndDeletedChars;
+const diff = require("diff");
+const supplementalContextUtil_1 = require("../../shared/supplementalContextUtil/supplementalContextUtil");
+/**
+ * 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 = diff.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',
+    };
+}
+/** src: https://github.com/aws/aws-toolkit-vscode/blob/3921457b0a2094b831beea0d66cc2cbd2a833890/packages/amazonq/src/app/inline/EditRendering/diffUtils.ts#L18
+ * Apply a unified diff to original code to generate modified code
+ * @param originalCode The original code as a string
+ * @param unifiedDiff The unified diff content
+ * @returns The modified code after applying the diff
+ */
+function applyUnifiedDiff(docText, unifiedDiff) {
+    try {
+        // First try the standard diff package
+        try {
+            const result = diff.applyPatch(docText, unifiedDiff);
+            if (result !== false) {
+                return result;
+            }
+        }
+        catch (error) { }
+        // Parse the unified diff to extract the changes
+        const diffLines = unifiedDiff.split('\n');
+        let result = docText;
+        // Find all hunks in the diff
+        const hunkStarts = diffLines
+            .map((line, index) => (line.startsWith('@@ ') ? index : -1))
+            .filter(index => index !== -1);
+        // Process each hunk
+        for (const hunkStart of hunkStarts) {
+            // Parse the hunk header
+            const hunkHeader = diffLines[hunkStart];
+            const match = hunkHeader.match(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/);
+            if (!match) {
+                continue;
+            }
+            const oldStart = parseInt(match[1]);
+            const oldLines = parseInt(match[2]);
+            // Extract the content lines for this hunk
+            let i = hunkStart + 1;
+            const contentLines = [];
+            while (i < diffLines.length && !diffLines[i].startsWith('@@')) {
+                contentLines.push(diffLines[i]);
+                i++;
+            }
+            // Build the old and new text
+            let oldText = '';
+            let newText = '';
+            for (const line of contentLines) {
+                if (line.startsWith('-')) {
+                    oldText += line.substring(1) + '\n';
+                }
+                else if (line.startsWith('+')) {
+                    newText += line.substring(1) + '\n';
+                }
+                else if (line.startsWith(' ')) {
+                    oldText += line.substring(1) + '\n';
+                    newText += line.substring(1) + '\n';
+                }
+            }
+            // Remove trailing newline if it was added
+            oldText = oldText.replace(/\n$/, '');
+            newText = newText.replace(/\n$/, '');
+            // Find the text to replace in the document
+            const docLines = docText.split('\n');
+            const startLine = oldStart - 1; // Convert to 0-based
+            const endLine = startLine + oldLines;
+            // Extract the text that should be replaced
+            const textToReplace = docLines.slice(startLine, endLine).join('\n');
+            // Replace the text
+            result = result.replace(textToReplace, newText);
+        }
+        return result;
+    }
+    catch (error) {
+        return docText; // Return original text if all methods fail
+    }
+}
+// src https://github.com/aws/aws-toolkit-vscode/blob/3921457b0a2094b831beea0d66cc2cbd2a833890/packages/amazonq/src/app/inline/EditRendering/diffUtils.ts#L147
+function getAddedAndDeletedChars(unifiedDiff) {
+    let addedCharacters = '';
+    let deletedCharacters = '';
+    const lines = unifiedDiff.split('\n');
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (line.startsWith('+') && !line.startsWith('+++')) {
+            addedCharacters += line.slice(1);
+        }
+        else if (line.startsWith('-') && !line.startsWith('---')) {
+            const removedLine = line.slice(1);
+            // Check if this is a modified line rather than a pure deletion
+            const nextLine = lines[i + 1];
+            if (nextLine && nextLine.startsWith('+') && !nextLine.startsWith('+++')) {
+                // This is a modified line, not a pure deletion
+                // We've already counted the deletion, so we'll just increment i to skip the next line
+                // since we'll process the addition on the next iteration
+                const addedLine = nextLine.slice(1);
+                const changes = diff.diffChars(removedLine, addedLine);
+                for (const part of changes) {
+                    if (part.removed) {
+                        deletedCharacters += part.value;
+                    }
+                    else if (part.added) {
+                        addedCharacters += part.value;
+                    }
+                }
+                i += 1;
+            }
+            else {
+                deletedCharacters += removedLine;
+            }
+        }
+    }
+    return {
+        addedCharacters,
+        deletedCharacters,
+    };
+}
+//# sourceMappingURL=diffUtils.js.map

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

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