nes: refactor: remove ghNearbyNesProvider.ts (#1664)

* nes: refactor: move out `editWouldUndo`

* nes: refactor:  rename file to better reflect what it is

Author: ulugbekna

src/extension/inlineEdits/common/ghNearbyNesProvider.tsx renamed to src/extension/inlineEdits/common/informationDelta.tsx

@@ -3,39 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { StatelessNextEditDocument } from '../../../platform/inlineEdits/common/statelessNextEditProvider';
-import { LineEdit } from '../../../util/vs/editor/common/core/edits/lineEdit';
 import { StringEdit } from '../../../util/vs/editor/common/core/edits/stringEdit';
 import { OffsetRange } from '../../../util/vs/editor/common/core/ranges/offsetRange';
 
 const N_GRAM_UNDO_RATIO_TO_FILTER_OUT = 0.7;
 
-export function editWouldDeleteWhatWasJustInserted(activeDocument: StatelessNextEditDocument, lineEdit: LineEdit) {
-	let edit = lineEdit.toEdit(activeDocument.documentAfterEdits);
-	// ! important: reduce it to the minimal set of changes
-	edit = edit.normalizeOnSource(activeDocument.documentAfterEdits.value);
-	if (!editIsDeletion(edit)) {
-		return false;
-	}
-	// We are deleting something. Is it what was just inserted?
-	for (let i = activeDocument.recentEdits.edits.length - 1; i >= 0; i--) {
-		const recentEdit = activeDocument.recentEdits.edits[i];
-		const rebaseResult = edit.tryRebase(recentEdit);
-		if (!rebaseResult) {
-			// the edit we want to do cannot be rebased, which indicates that it would interfere with a recent edit
-			return true;
-		}
-		edit = rebaseResult;
-	}
-	return false;
-}
-
-function editIsDeletion(edit: StringEdit): boolean {
-	const deletedChars = edit.replacements.reduce((acc, singleEdit) => acc + singleEdit.replaceRange.length, 0);
-	const insertedChars = edit.replacements.reduce((acc, singleEdit) => acc + singleEdit.newText.length, 0);
-	return insertedChars === 0 && deletedChars > 0;
-}
-
 /**
  * Represents information loss/gain (4-grams) via an edit.
  */

src/extension/inlineEdits/vscode-node/features/diagnosticsCompletionProcessor.ts

@@ -31,7 +31,7 @@ import { StringEdit } from '../../../../util/vs/editor/common/core/edits/stringE
 import { Position } from '../../../../util/vs/editor/common/core/position';
 import { OffsetRange } from '../../../../util/vs/editor/common/core/ranges/offsetRange';
 import { StringText } from '../../../../util/vs/editor/common/core/text/abstractText';
-import { getInformationDelta, InformationDelta } from '../../common/ghNearbyNesProvider';
+import { getInformationDelta, InformationDelta } from '../../common/informationDelta';
 import { RejectionCollector } from '../../common/rejectionCollector';
 import { IVSCodeObservableDocument, VSCodeWorkspace } from '../parts/vscodeWorkspace';
 import { AnyDiagnosticCompletionItem, AnyDiagnosticCompletionProvider } from './diagnosticsBasedCompletions/anyDiagnosticsCompletionProvider';

src/extension/xtab/node/xtabProvider.ts

@@ -23,7 +23,7 @@ import { LanguageContextLanguages, LanguageContextOptions } from '../../../platf
 import { InlineEditRequestLogContext } from '../../../platform/inlineEdits/common/inlineEditLogContext';
 import { ResponseProcessor } from '../../../platform/inlineEdits/common/responseProcessor';
 import { IStatelessNextEditProvider, NoNextEditReason, PushEdit, ShowNextEditPreference, StatelessNextEditDocument, StatelessNextEditRequest, StatelessNextEditResult, StatelessNextEditTelemetryBuilder } from '../../../platform/inlineEdits/common/statelessNextEditProvider';
-import { IgnoreEmptyLineAndLeadingTrailingWhitespaceChanges, IgnoreWhitespaceOnlyChanges } from '../../../platform/inlineEdits/common/statelessNextEditProviders';
+import { editWouldDeleteWhatWasJustInserted, IgnoreEmptyLineAndLeadingTrailingWhitespaceChanges, IgnoreWhitespaceOnlyChanges } from '../../../platform/inlineEdits/common/statelessNextEditProviders';
 import { ILanguageContextProviderService } from '../../../platform/languageContextProvider/common/languageContextProviderService';
 import { ILanguageDiagnosticsService } from '../../../platform/languages/common/languageDiagnosticsService';
 import { ContextKind, SnippetContext } from '../../../platform/languageServer/common/languageContextService';
@@ -52,7 +52,6 @@ import { OffsetRange } from '../../../util/vs/editor/common/core/ranges/offsetRa
 import { IInstantiationService } from '../../../util/vs/platform/instantiation/common/instantiation';
 import { Position as VscodePosition } from '../../../vscodeTypes';
 import { Delayer, DelaySession } from '../../inlineEdits/common/delayer';
-import { editWouldDeleteWhatWasJustInserted } from '../../inlineEdits/common/ghNearbyNesProvider';
 import { getOrDeduceSelectionFromLastEdit } from '../../inlineEdits/common/nearbyCursorInlineEditProvider';
 import { IgnoreImportChangesAspect } from '../../inlineEdits/node/importFiltering';
 import { createTaggedCurrentFileContentUsingPagedClipping, getUserPrompt, N_LINES_ABOVE, N_LINES_AS_CONTEXT, N_LINES_BELOW, PromptPieces } from '../common/promptCrafting';

src/platform/inlineEdits/common/statelessNextEditProviders.ts

@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LineReplacement } from '../../../util/vs/editor/common/core/edits/lineEdit';
+import { LineEdit, LineReplacement } from '../../../util/vs/editor/common/core/edits/lineEdit';
+import { StringEdit } from '../../../util/vs/editor/common/core/edits/stringEdit';
 import { StatelessNextEditDocument } from './statelessNextEditProvider';
 
 export class IgnoreEmptyLineAndLeadingTrailingWhitespaceChanges {
@@ -57,3 +58,29 @@ export class IgnoreWhitespaceOnlyChanges {
 		return originalLines === newLines;
 	}
 }
+
+export function editWouldDeleteWhatWasJustInserted(activeDocument: StatelessNextEditDocument, lineEdit: LineEdit) {
+	let edit = lineEdit.toEdit(activeDocument.documentAfterEdits);
+	// ! important: reduce it to the minimal set of changes
+	edit = edit.normalizeOnSource(activeDocument.documentAfterEdits.value);
+	if (!editIsDeletion(edit)) {
+		return false;
+	}
+	// We are deleting something. Is it what was just inserted?
+	for (let i = activeDocument.recentEdits.edits.length - 1; i >= 0; i--) {
+		const recentEdit = activeDocument.recentEdits.edits[i];
+		const rebaseResult = edit.tryRebase(recentEdit);
+		if (!rebaseResult) {
+			// the edit we want to do cannot be rebased, which indicates that it would interfere with a recent edit
+			return true;
+		}
+		edit = rebaseResult;
+	}
+	return false;
+}
+export function editIsDeletion(edit: StringEdit): boolean {
+	const deletedChars = edit.replacements.reduce((acc, singleEdit) => acc + singleEdit.replaceRange.length, 0);
+	const insertedChars = edit.replacements.reduce((acc, singleEdit) => acc + singleEdit.newText.length, 0);
+	return insertedChars === 0 && deletedChars > 0;
+}
+