@aws/lsp-codewhisperer 0.0.83 → 0.0.84

package/out/language-server/inline-completion/handler/sessionResultsHandler.js

@@ -0,0 +1,119 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SessionResultsHandler = void 0;
+const codeWhispererService_1 = require("../../../shared/codeWhispererService");
+const diffUtils_1 = require("../utils/diffUtils");
+const utils_1 = require("../../../shared/utils");
+const telemetry_1 = require("../telemetry/telemetry");
+class SessionResultsHandler {
+    logging;
+    telemetry;
+    telemetryService;
+    completionSessionManager;
+    editSessionManager;
+    codePercentageTracker;
+    codeDiffTracker;
+    rejectedEditTracker;
+    streakTracker;
+    getEditsEnabled;
+    getTimeSinceLastUserModification;
+    constructor(logging, telemetry, telemetryService, completionSessionManager, editSessionManager, codePercentageTracker, codeDiffTracker, rejectedEditTracker, streakTracker, getEditsEnabled, getTimeSinceLastUserModification) {
+        this.logging = logging;
+        this.telemetry = telemetry;
+        this.telemetryService = telemetryService;
+        this.completionSessionManager = completionSessionManager;
+        this.editSessionManager = editSessionManager;
+        this.codePercentageTracker = codePercentageTracker;
+        this.codeDiffTracker = codeDiffTracker;
+        this.rejectedEditTracker = rejectedEditTracker;
+        this.streakTracker = streakTracker;
+        this.getEditsEnabled = getEditsEnabled;
+        this.getTimeSinceLastUserModification = getTimeSinceLastUserModification;
+    }
+    // Schedule tracker for UserModification Telemetry event
+    enqueueCodeDiffEntry(session, acceptedSuggestion, addedCharactersForEdit) {
+        const endPosition = (0, utils_1.getEndPositionForAcceptedSuggestion)(acceptedSuggestion.content, session.startPosition);
+        // use the addedCharactersForEdit if it is EDIT suggestion type
+        const originalString = addedCharactersForEdit ? addedCharactersForEdit : acceptedSuggestion.content;
+        this.codeDiffTracker.enqueue({
+            sessionId: session.codewhispererSessionId || '',
+            requestId: session.responseContext?.requestId || '',
+            fileUrl: session.document.uri,
+            languageId: session.language,
+            time: Date.now(),
+            originalString: originalString,
+            startPosition: session.startPosition,
+            endPosition: endPosition,
+            customizationArn: session.customizationArn,
+            completionType: (0, utils_1.getCompletionType)(acceptedSuggestion),
+            triggerType: session.triggerType,
+            credentialStartUrl: session.credentialStartUrl,
+        });
+    }
+    async handleSessionResults(params) {
+        const { sessionId, completionSessionResult, firstCompletionDisplayLatency, totalSessionDisplayTime, typeaheadLength, isInlineEdit, addedDiagnostics, removedDiagnostics, } = params;
+        const sessionManager = params.isInlineEdit ? this.editSessionManager : this.completionSessionManager;
+        const session = sessionManager.getSessionById(sessionId);
+        if (!session) {
+            this.logging.log(`ERROR: Session ID ${sessionId} was not found`);
+            return;
+        }
+        if (session.state !== 'ACTIVE') {
+            this.logging.log(`ERROR: Trying to record trigger decision for not-active session ${sessionId} with wrong state ${session.state}`);
+            return;
+        }
+        const acceptedItemId = Object.keys(params.completionSessionResult).find(k => params.completionSessionResult[k].accepted);
+        const isAccepted = acceptedItemId ? true : false;
+        const acceptedSuggestion = session.suggestions.find(s => s.itemId === acceptedItemId);
+        let addedLengthForEdits = 0;
+        let deletedLengthForEdits = 0;
+        if (acceptedSuggestion) {
+            this.codePercentageTracker.countSuccess(session.language);
+            if (session.predictionType === codeWhispererService_1.SuggestionType.EDIT && acceptedSuggestion.content) {
+                // [acceptedSuggestion.insertText] will be undefined for NEP suggestion. Use [acceptedSuggestion.content] instead.
+                // Since [acceptedSuggestion.content] is in the form of a diff, transform the content into addedCharacters and deletedCharacters.
+                const { addedLines, deletedLines } = (0, diffUtils_1.getAddedAndDeletedLines)(acceptedSuggestion.content);
+                const charDiffResult = (0, diffUtils_1.getCharacterDifferences)(addedLines, deletedLines);
+                addedLengthForEdits = charDiffResult.charactersAdded;
+                deletedLengthForEdits = charDiffResult.charactersRemoved;
+                this.codePercentageTracker.countAcceptedTokensUsingCount(session.language, charDiffResult.charactersAdded);
+                this.codePercentageTracker.addTotalTokensForEdits(session.language, charDiffResult.charactersAdded);
+                this.enqueueCodeDiffEntry(session, acceptedSuggestion, addedLines.join('\n'));
+            }
+            else if (acceptedSuggestion.insertText) {
+                this.codePercentageTracker.countAcceptedTokens(session.language, acceptedSuggestion.insertText);
+                this.codePercentageTracker.countTotalTokens(session.language, acceptedSuggestion.insertText, true);
+                this.enqueueCodeDiffEntry(session, acceptedSuggestion);
+            }
+        }
+        // Handle rejected edit predictions
+        if (isInlineEdit && !isAccepted) {
+            // Find all rejected suggestions in this session
+            const rejectedSuggestions = session.suggestions.filter(suggestion => {
+                const result = completionSessionResult[suggestion.itemId];
+                return result && result.seen && !result.accepted;
+            });
+            // Record each rejected edit
+            for (const rejectedSuggestion of rejectedSuggestions) {
+                if (rejectedSuggestion.content) {
+                    this.rejectedEditTracker.recordRejectedEdit({
+                        content: rejectedSuggestion.content,
+                        timestamp: Date.now(),
+                        documentUri: session.document.uri,
+                        position: session.startPosition,
+                    });
+                    this.logging.debug(`[EDIT_PREDICTION] Recorded rejected edit: ${rejectedSuggestion.content.substring(0, 20)}...`);
+                }
+            }
+        }
+        session.setClientResultData(completionSessionResult, firstCompletionDisplayLatency, totalSessionDisplayTime, typeaheadLength);
+        if (firstCompletionDisplayLatency)
+            (0, telemetry_1.emitPerceivedLatencyTelemetry)(this.telemetry, session);
+        // Always emit user trigger decision at session close
+        sessionManager.closeSession(session);
+        const streakLength = this.getEditsEnabled() ? this.streakTracker.getAndUpdateStreakLength(isAccepted) : 0;
+        await (0, telemetry_1.emitUserTriggerDecisionTelemetry)(this.telemetry, this.telemetryService, session, this.getTimeSinceLastUserModification(), addedLengthForEdits, deletedLengthForEdits, addedDiagnostics, removedDiagnostics, streakLength, Object.keys(params.completionSessionResult)[0]);
+    }
+}
+exports.SessionResultsHandler = SessionResultsHandler;
+//# sourceMappingURL=sessionResultsHandler.js.map

package/out/language-server/inline-completion/handler/sessionResultsHandler.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../../src/language-server/inline-completion/telemetry/telemetry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../../src/language-server/inline-completion/telemetry/telemetry.ts"],"names":[],"mappings":";;;AA+GA,sFA4BC;AApID,iDAAqE;AAErE,+EAAqE;AAE9D,MAAM,8BAA8B,GAAG,CAC1C,SAAoB,EACpB,OAA6B,EAC7B,SAAiB,EACnB,EAAE;IACA,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,SAAS,CAAA;IACzD,MAAM,IAAI,GAAwC;QAC9C,sBAAsB,EAAE,SAAS;QACjC,sBAAsB,EAAE,OAAO,CAAC,eAAe,EAAE,sBAAsB;QACvE,gCAAgC,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;QAChE,2BAA2B,EACvB,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAiB,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QAC1F,wBAAwB,EAAE,OAAO,CAAC,WAAW;QAC7C,iCAAiC,EAAE,OAAO,CAAC,eAAe;QAC1D,QAAQ;QACR,uBAAuB,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI;QACnD,yBAAyB,EAAE,OAAO,CAAC,aAAa,CAAC,SAAS;QAC1D,qBAAqB,EAAE,OAAO,CAAC,QAAQ;QACvC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,uCAAuC,EAAE,OAAO,CAAC,oBAAoB,EAAE,gBAAgB;QACvF,qCAAqC,EAAE,OAAO,CAAC,oBAAoB,EAAE,KAAK;QAC1E,uCAAuC,EAAE,OAAO,CAAC,oBAAoB,EAAE,OAAO;QAC9E,sCAAsC,EAAE,OAAO,CAAC,oBAAoB,EAAE,cAAc;QACpF,6BAA6B,EAAE,OAAO,CAAC,gBAAgB;QACvD,MAAM,EAAE,WAAW;QACnB,wCAAwC,EAAE,OAAO,CAAC,6BAA6B;KAClF,CAAA;IACD,SAAS,CAAC,UAAU,CAAC;QACjB,IAAI,EAAE,iCAAiC;QACvC,MAAM,EAAE,WAAW;QACnB,IAAI,EAAE;YACF,GAAG,IAAI;YACP,wCAAwC,EAAE,OAAO,CAAC,6BAA6B;SAClF;KACJ,CAAC,CAAA;AACN,CAAC,CAAA;AAnCY,QAAA,8BAA8B,kCAmC1C;AAEM,MAAM,4BAA4B,GAAG,CACxC,SAAoB,EACpB,OAA6B,EAC7B,KAAuB,EACzB,EAAE;IACA,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,SAAS,CAAA;IACzD,MAAM,sBAAsB,GAAG,IAAA,kBAAU,EAAC,KAAK,CAAC,CAAC,CAAC,CAAE,KAAa,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;IAEvF,MAAM,IAAI,GAAwC;QAC9C,sBAAsB,EAAE,sBAAsB;QAC9C,sBAAsB,EAAE,SAAS;QACjC,gCAAgC,EAAE,CAAC,CAAC;QACpC,wBAAwB,EAAE,OAAO,CAAC,WAAW;QAC7C,iCAAiC,EAAE,OAAO,CAAC,eAAe;QAC1D,MAAM,EAAE,uCAAuC,KAAK,CAAC,IAAI,IAAI,cAAc,EAAE;QAC7E,QAAQ;QACR,uBAAuB,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI;QACnD,yBAAyB,EAAE,OAAO,CAAC,aAAa,CAAC,SAAS;QAC1D,qBAAqB,EAAE,OAAO,CAAC,QAAQ;QACvC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,uCAAuC,EAAE,OAAO,CAAC,oBAAoB,EAAE,gBAAgB;QACvF,qCAAqC,EAAE,OAAO,CAAC,oBAAoB,EAAE,KAAK;QAC1E,uCAAuC,EAAE,OAAO,CAAC,oBAAoB,EAAE,OAAO;QAC9E,sCAAsC,EAAE,OAAO,CAAC,oBAAoB,EAAE,cAAc;QACpF,6BAA6B,EAAE,OAAO,CAAC,gBAAgB;QACvD,wCAAwC,EAAE,OAAO,CAAC,6BAA6B;QAC/E,MAAM,EAAE,QAAQ;QAChB,OAAO,EAAE,QAAQ;KACpB,CAAA;IAED,SAAS,CAAC,UAAU,CAAC;QACjB,IAAI,EAAE,iCAAiC;QACvC,MAAM,EAAE,QAAQ;QAChB,IAAI;QACJ,SAAS,EAAE;YACP,MAAM,EAAE,KAAK,CAAC,IAAI,IAAI,cAAc;YACpC,SAAS,EAAE,IAAA,kBAAU,EAAC,KAAK,CAAC,CAAC,CAAC,CAAE,KAAa,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;YAC9D,cAAc,EAAE,IAAA,kBAAU,EAAC,KAAK,CAAC,CAAC,CAAC,CAAE,KAAa,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;SAC5E;KACJ,CAAC,CAAA;AACN,CAAC,CAAA;AAxCY,QAAA,4BAA4B,gCAwCxC;AAEM,MAAM,6BAA6B,GAAG,CAAC,SAAoB,EAAE,OAA6B,EAAE,EAAE;IACjG,MAAM,IAAI,GAAuC;QAC7C,sBAAsB,EAAE,OAAO,CAAC,eAAe,EAAE,SAAS;QAC1D,sBAAsB,EAAE,OAAO,CAAC,eAAe,EAAE,sBAAsB;QACvE,2BAA2B,EACvB,OAAO,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAiB,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QAC1F,wBAAwB,EAAE,OAAO,CAAC,WAAW;QAC7C,QAAQ,EAAE,OAAO,CAAC,6BAA6B;QAC/C,qBAAqB,EAAE,OAAO,CAAC,QAAQ;QACvC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,6BAA6B,EAAE,OAAO,CAAC,gBAAgB;QACvD,MAAM,EAAE,WAAW;QACnB,OAAO,EAAE,IAAI;KAChB,CAAA;IAED,SAAS,CAAC,UAAU,CAAC;QACjB,IAAI,EAAE,gCAAgC;QACtC,IAAI;KACP,CAAC,CAAA;AACN,CAAC,CAAA;AAnBY,QAAA,6BAA6B,iCAmBzC;AAEM,KAAK,UAAU,qCAAqC,CACvD,gBAAkC,EAClC,OAA6B,EAC7B,6BAAsC,EACtC,YAAqB;IAErB,yDAAyD;IACzD,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;QAC/B,OAAM;IACV,CAAC;IAED,eAAe;IACf,IAAA,kDAA0C,EACtC,gBAAgB,EAChB,OAAO,EACP,OAAO,EACP,6BAA6B,EAC7B,CAAC,EACD,CAAC,EACD,EAAE,EACF,EAAE,EACF,YAAY,CACf;SACI,IAAI,EAAE;SACN,KAAK,CAAC,CAAC,CAAC,EAAE,GAAE,CAAC,CAAC;SACd,OAAO,CAAC,GAAG,EAAE;QACV,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAA;IACvC,CAAC,CAAC,CAAA;AACV,CAAC;AAEM,MAAM,gCAAgC,GAAG,KAAK,EACjD,SAAoB,EACpB,gBAAkC,EAClC,OAA6B,EAC7B,6BAAsC,EACtC,gCAAyC,EACzC,kCAA2C,EAC3C,mBAAqC,EACrC,qBAAuC,EACvC,YAAqB,EACrB,MAAe,EACjB,EAAE;IACA,yDAAyD;IACzD,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;QAC/B,OAAM;IACV,CAAC;IAED,wFAAwF;IACxF,0EAA0E;IAC1E,MAAM,mBAAmB,GACrB,OAAO,CAAC,cAAc,KAAK,qCAAc,CAAC,IAAI;QAC1C,CAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC,MAAM,CAAC;QACxC,CAAC,CAAC,OAAO,CAAC,gCAAgC,EAAE,CAAA;IAEpD,8EAA8E;IAC9E,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACvB,OAAM;IACV,CAAC;IAED,MAAM,IAAA,kDAA0C,EAC5C,gBAAgB,EAChB,OAAO,EACP,mBAAmB,EACnB,6BAA6B,EAC7B,gCAAgC,EAChC,kCAAkC,EAClC,mBAAmB,EACnB,qBAAqB,EACrB,YAAY,CACf,CAAA;IAED,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAA;AACvC,CAAC,CAAA;AA1CY,QAAA,gCAAgC,oCA0C5C;AAEM,MAAM,0CAA0C,GAAG,CACtD,gBAAkC,EAClC,OAA6B,EAC7B,mBAAwC,EACxC,6BAAsC,EACtC,gCAAyC,EACzC,kCAA2C,EAC3C,mBAAqC,EACrC,qBAAuC,EACvC,YAAqB,EACvB,EAAE;IACA,OAAO,gBAAgB,CAAC,uBAAuB,CAC3C,OAAO,EACP,mBAAmB,EACnB,6BAA6B,EAC7B,gCAAgC,EAChC,kCAAkC,EAClC,mBAAmB,EACnB,qBAAqB,EACrB,YAAY,CACf,CAAA;AACL,CAAC,CAAA;AArBY,QAAA,0CAA0C,8CAqBtD"}

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

@@ -2,7 +2,10 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
+import { Hunk } from 'diff';
 import { CodeWhispererSupplementalContext } from '../../../shared/models/model';
+import { Position, TextDocument } from '@aws/language-server-runtimes/protocol';
+import { SuggestionType } from '../../../shared/codeWhispererService';
 /**
  * Generates a unified diff format between old and new file contents
  *
@@ -37,21 +40,10 @@ export interface FileSnapshotContent {
  * @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 getAddedAndDeletedLines(unifiedDiff: string): {
     addedLines: string[];
     deletedLines: string[];
 };
-export declare function getAddedAndDeletedChars(unifiedDiff: string): {
-    addedCharacters: string;
-    deletedCharacters: string;
-};
 /**
  * Calculate character differences between added and deleted text blocks using LCS
  */
@@ -63,3 +55,28 @@ export interface CharDiffResult {
  * Calculate character differences between added and deleted blocks
  */
 export declare function getCharacterDifferences(addedLines: string[], deletedLines: string[]): CharDiffResult;
+export declare function processEditSuggestion(unifiedDiff: string, triggerPosition: Position, document: TextDocument, rightContext: string): {
+    suggestionContent: string;
+    type: SuggestionType;
+};
+interface UnifiedDiff {
+    linesWithoutHeaders: string[];
+    firstMinusIndex: number;
+    firstPlusIndex: number;
+    minusIndexes: number[];
+    plusIndexes: number[];
+    hunk: Hunk;
+}
+export declare function readUdiff(unifiedDiff: string): UnifiedDiff;
+export declare function categorizeUnifieddiff(unifiedDiff: string, userTriggerAtLine?: number): 'addOnly' | 'deleteOnly' | 'edit';
+export declare function extractAdditions(unifiedDiff: string): string;
+/**
+ *
+ * example
+ * code = 'return'
+ * suggestion = 'return a + b;'
+ * output = ' a + b;'
+ */
+export declare function removeOverlapCodeFromSuggestion(code: string, suggestion: string): string;
+export declare function longestCommonPrefix(str1: string, str2: string): string;
+export {};

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

@@ -6,12 +6,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateUnifiedDiffWithTimestamps = generateUnifiedDiffWithTimestamps;
 exports.generateDiffContexts = generateDiffContexts;
-exports.applyUnifiedDiff = applyUnifiedDiff;
 exports.getAddedAndDeletedLines = getAddedAndDeletedLines;
-exports.getAddedAndDeletedChars = getAddedAndDeletedChars;
 exports.getCharacterDifferences = getCharacterDifferences;
-const diff = require("diff");
+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
  *
@@ -25,7 +32,7 @@ const supplementalContextUtil_1 = require("../../../shared/supplementalContextUt
  * @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 });
+    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:')) {
@@ -88,79 +95,6 @@ function generateDiffContexts(filePath, currentContent, snapshotContents, maxCon
         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
-    }
-}
 function getAddedAndDeletedLines(unifiedDiff) {
     const lines = unifiedDiff.split('\n');
     const addedLines = lines.filter(line => line.startsWith('+') && !line.startsWith('+++')).map(line => line.slice(1));
@@ -172,46 +106,6 @@ function getAddedAndDeletedLines(unifiedDiff) {
         deletedLines,
     };
 }
-// 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,
-    };
-}
 /**
  * Find longest common subsequence length between two strings
  */
@@ -252,4 +146,262 @@ function getCharacterDifferences(addedLines, deletedLines) {
         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