Skip to content

V
vscode

xxadev / vscode
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
V
vscode

体验新版 GitCode，发现更多精彩内容 >>

提交 7b1cedcf 编写于 作者: J Johannes Rieken 提交者： Erich Gamma
浏览文件
操作

fix #82491

上级 ba82bddd
隐藏空白更改
内联 并排
Showing with 4 addition and 5 deletion
src/vs/editor/contrib/suggest/suggestController.ts
浏览文件 @ 7b1cedcf
...@@ -242,8 +242,7 @@ export class SuggestController implements IEditorContribution { ...@@ -242,8 +242,7 @@ export class SuggestController implements IEditorContribution {
const model = this._editor.getModel(); const model = this._editor.getModel();
const modelVersionNow = model.getAlternativeVersionId(); const modelVersionNow = model.getAlternativeVersionId();
const { completion: suggestion, position } = event.item; const { completion: suggestion, position } = event.item;
const editorPosition = this._editor.getPosition(); const columnDelta = this._editor.getPosition().column - position.column;
const columnDelta = editorPosition.column - position.column;
// pushing undo stops *before* additional text edits and // pushing undo stops *before* additional text edits and
// *after* the main edit // *after* the main edit
...@@ -256,7 +255,7 @@ export class SuggestController implements IEditorContribution { ...@@ -256,7 +255,7 @@ export class SuggestController implements IEditorContribution {
} }
// keep item in memory // keep item in memory
this._memoryService.memorize(model, editorPosition, event.item); this._memoryService.memorize(model, this._editor.getPosition(), event.item);
let { insertText } = suggestion; let { insertText } = suggestion;
if (!(suggestion.insertTextRules! & CompletionItemInsertTextRule.InsertAsSnippet)) { if (!(suggestion.insertTextRules! & CompletionItemInsertTextRule.InsertAsSnippet)) {
...@@ -265,7 +264,7 @@ export class SuggestController implements IEditorContribution { ...@@ -265,7 +264,7 @@ export class SuggestController implements IEditorContribution {
let overwriteBefore = position.column - suggestion.range.startColumn; let overwriteBefore = position.column - suggestion.range.startColumn;
let overwriteAfter = suggestion.range.endColumn - position.column; let overwriteAfter = suggestion.range.endColumn - position.column;
let suffixDelta = this._lineSuffix.value ? this._lineSuffix.value.delta(editorPosition) : 0; let suffixDelta = this._lineSuffix.value ? this._lineSuffix.value.delta(this._editor.getPosition()) : 0;
let word: IWordAtPosition | null; let word: IWordAtPosition | null;
if (!keepSuffix) { if (!keepSuffix) {
// don't overwrite anything right of the cursor // don't overwrite anything right of the cursor
...@@ -273,7 +272,7 @@ export class SuggestController implements IEditorContribution { ...@@ -273,7 +272,7 @@ export class SuggestController implements IEditorContribution {
} else if (overwriteAfter === 0 && (word = model.getWordAtPosition(position))) { } else if (overwriteAfter === 0 && (word = model.getWordAtPosition(position))) {
// compute fallback overwrite length // compute fallback overwrite length
overwriteAfter = word.endColumn - editorPosition.column; overwriteAfter = word.endColumn - this._editor.getPosition().column;
} }
SnippetController2.get(this._editor).insert(insertText, { SnippetController2.get(this._editor).insert(insertText, {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或