Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

* Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973

* disable strict null check
This commit is contained in:
Anthony Dresser
2019-07-15 22:35:46 -07:00
committed by GitHub
parent f720ec642f
commit 0b7e7ddbf9
2406 changed files with 59140 additions and 35464 deletions

View File

@@ -33,7 +33,7 @@ export class TabCompletionController implements editorCommon.IEditorContribution
private _activeSnippets: Snippet[] = [];
private _enabled: boolean;
private _selectionListener: IDisposable;
private _configListener: IDisposable;
private readonly _configListener: IDisposable;
constructor(
private readonly _editor: ICodeEditor,
@@ -129,7 +129,7 @@ export class TabCompletionController implements editorCommon.IEditorContribution
if (this._activeSnippets.length === 1) {
// one -> just insert
const [snippet] = this._activeSnippets;
SnippetController2.get(this._editor).insert(snippet.codeSnippet, snippet.prefix.length, 0);
SnippetController2.get(this._editor).insert(snippet.codeSnippet, { overwriteBefore: snippet.prefix.length, overwriteAfter: 0 });
} else if (this._activeSnippets.length > 1) {
// two or more -> show IntelliSense box