Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adopts equality comparer for inline suggestions

Browse Source
This commit is contained in:
Henning Dieterichs
2023-07-31 23:20:48 +02:00
committed by Henning Dieterichs
parent 6b92e4f47a
commit c76cbcb6cd
3 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/vs/editor/contrib/inlineCompletions/browser/ghostText.ts
View File

@@ -118,6 +118,30 @@ export class GhostTextReplacement {
isEmpty(): boolean {
return this.parts.every(p => p.lines.length === 0);
}
equals(other: GhostTextReplacement): boolean {
return this.lineNumber === other.lineNumber &&
this.columnRange.equals(other.columnRange) &&
this.newLines.length === other.newLines.length &&
this.newLines.every((line, index) => line === other.newLines[index]) &&
this.additionalReservedLineCount === other.additionalReservedLineCount;
}
}
export type GhostTextOrReplacement = GhostText | GhostTextReplacement;
export function ghostTextOrReplacementEquals(a: GhostTextOrReplacement | undefined, b: GhostTextOrReplacement | undefined): boolean {
if (a === b) {
return true;
}
if (!a || !b) {
return false;
}
if (a instanceof GhostText && b instanceof GhostText) {
return a.equals(b);
}
if (a instanceof GhostTextReplacement && b instanceof GhostTextReplacement) {
return a.equals(b);
}
return false;
}

19
src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
View File

@@ -6,7 +6,7 @@
import { mapFind } from 'vs/base/common/arrays';
import { BugIndicatingError, onUnexpectedExternalError } from 'vs/base/common/errors';
import { Disposable } from 'vs/base/common/lifecycle';
import { IObservable, ITransaction, autorun, derived, derivedHandleChanges, keepAlive, observableSignal, observableValue, subtransaction, transaction } from 'vs/base/common/observable';
import { IObservable, ITransaction, autorun, derived, derivedHandleChanges, derivedOpts, keepAlive, observableSignal, observableValue, subtransaction, transaction } from 'vs/base/common/observable';
import { isDefined } from 'vs/base/common/types';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { EditOperation } from 'vs/editor/common/core/editOperation';
@@ -16,7 +16,7 @@ import { InlineCompletionContext, InlineCompletionTriggerKind } from 'vs/editor/
import { ILanguageConfigurationService } from 'vs/editor/common/languages/languageConfigurationRegistry';
import { EndOfLinePreference, ITextModel } from 'vs/editor/common/model';
import { IFeatureDebounceInformation } from 'vs/editor/common/services/languageFeatureDebounce';
import { GhostText, GhostTextOrReplacement } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
import { GhostText, GhostTextOrReplacement, ghostTextOrReplacementEquals } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
import { InlineCompletionWithUpdatedRange, InlineCompletionsSource } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource';
import { SuggestItemInfo } from 'vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider';
import { addPositions, lengthOfText } from 'vs/editor/contrib/inlineCompletions/browser/utils';
@@ -192,11 +192,18 @@ export class InlineCompletionsModel extends Disposable {
}
});
public readonly state = derived<{
public readonly state = derivedOpts<{
suggestItem: SuggestItemInfo | undefined;
inlineCompletion: InlineCompletionWithUpdatedRange | undefined;
ghostText: GhostTextOrReplacement;
} | undefined>((reader) => {
} | undefined>({
equalityComparer: (a, b) => {
if (!a || !b) { return a === b; }
return ghostTextOrReplacementEquals(a.ghostText, b.ghostText)
&& a.inlineCompletion === b.inlineCompletion
&& a.suggestItem === b.suggestItem;
}
}, (reader) => {
/** @description ghostTextAndCompletion */
const model = this.textModel;
@@ -243,7 +250,9 @@ export class InlineCompletionsModel extends Disposable {
}
});
public readonly ghostText = derived(reader => {
public readonly ghostText = derivedOpts({
equalityComparer: ghostTextOrReplacementEquals
}, reader => {
/** @description ghostText */
const v = this.state.read(reader);
if (!v) { return undefined; }

5
src/vs/editor/contrib/inlineCompletions/browser/utils.ts
View File

@@ -67,6 +67,11 @@ export class ColumnRange {
toRange(lineNumber: number): Range {
return new Range(lineNumber, this.startColumn, lineNumber, this.endColumnExclusive);
}
equals(other: ColumnRange): boolean {
return this.startColumn === other.startColumn
&& this.endColumnExclusive === other.endColumnExclusive;
}
}
export function applyObservableDecorations(editor: ICodeEditor, decorations: IObservable<IModelDeltaDecoration[]>): IDisposable {