Merge branch 'master' into playwright-npm

extensions/html-language-features/server/package.json

@@ -10,7 +10,7 @@
   "main": "./out/htmlServerMain",
   "dependencies": {
     "vscode-css-languageservice": "^4.1.2",
-    "vscode-html-languageservice": "^3.1.0-next.1",
+    "vscode-html-languageservice": "^3.1.0-next.2",
     "vscode-languageserver": "^6.1.1",
     "vscode-nls": "^4.1.2",
     "vscode-uri": "^2.1.2"

extensions/html-language-features/server/yarn.lock

@@ -736,10 +736,10 @@ vscode-css-languageservice@^4.1.2:
     vscode-nls "^4.1.2"
     vscode-uri "^2.1.1"
 
-vscode-html-languageservice@^3.1.0-next.1:
-  version "3.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-3.1.0-next.1.tgz#d981cf3026f24c674f749992a72f5c0aedb76e7a"
-  integrity sha512-p/R6yIt01rFL2wjlSOCYSVyELG6t2zOLyoVrJPXHFwuQ25Gi3NRHapE+2tXCqJjd2Ff2Bqu2Cs3+jf1DRS0/zA==
+vscode-html-languageservice@^3.1.0-next.2:
+  version "3.1.0-next.2"
+  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-3.1.0-next.2.tgz#a6ad42ed0ad0adda9ad0c5d34b2ac0d05076190e"
+  integrity sha512-cohfk2Ez8MrnT/8upnKsOc2FK2T+lU2LsBgg0L2P2BHjVzq4LMCOiYcwNeq+u9y2L5ck9E6SFw1BTdyZ5377KQ==
   dependencies:
     vscode-languageserver-textdocument "^1.0.1"
     vscode-languageserver-types "^3.15.1"

src/vs/editor/contrib/suggest/suggest.ts

@@ -55,12 +55,15 @@ export class CompletionItem {
 	idx?: number;
 	word?: string;
 
+	// resolving
+	private _isResolved: boolean = false;
+	private _resolveCache?: Promise<void>;
+
 	constructor(
 		readonly position: IPosition,
 		readonly completion: modes.CompletionItem,
 		readonly container: modes.CompletionList,
 		readonly provider: modes.CompletionItemProvider,
-		model: ITextModel
 	) {
 		this.textLabel = typeof completion.label === 'string'
 			? completion.label
@@ -104,14 +107,12 @@ export class CompletionItem {
 		}
 	}
 
-	// resolving
+	// ---- resolving
+
 	get isResolved() {
-		return Boolean(this._isResolved);
+		return this._isResolved;
 	}
 
-	private _resolveCache?: Promise<void>;
-	private _isResolved?: boolean;
-
 	async resolve(token: CancellationToken) {
 		if (!this._resolveCache) {
 			const sub = token.onCancellationRequested(() => {
@@ -194,7 +195,7 @@ export async function provideSuggestionItems(
 				if (!suggestion.sortText) {
 					suggestion.sortText = typeof suggestion.label === 'string' ? suggestion.label : suggestion.label.name;
 				}
-				result.push(new CompletionItem(position, suggestion, container, provider, model));
+				result.push(new CompletionItem(position, suggestion, container, provider));
 			}
 		}
 		if (isDisposable(container)) {

src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts

@@ -167,15 +167,9 @@ class BulkEditModel implements IDisposable {
 
 		this._edits.forEach((value, key) => {
 			const promise = this._textModelResolverService.createModelReference(URI.parse(key)).then(async ref => {
-				const model = ref.object;
-
-				if (!model || !model.textEditorModel) {
-					throw new Error(`Cannot load file ${key}`);
-				}
-
 				let task: ModelEditTask;
 				let makeMinimal = false;
-				if (this._editor && this._editor.hasModel() && this._editor.getModel().uri.toString() === model.textEditorModel.uri.toString()) {
+				if (this._editor && this._editor.hasModel() && this._editor.getModel().uri.toString() === ref.object.textEditorModel.uri.toString()) {
 					task = new EditorEditTask(ref, this._editor);
 					makeMinimal = true;
 				} else {