Merge pull request #1 from microsoft/master

Sync

.prettierrc

@@ -3,5 +3,6 @@
 	"singleQuote": true,
 	"trailingComma": "none",
 	"semi": true,
-	"useTabs": true
+	"useTabs": true,
+	"printWidth": 100
 }

monaco.d.ts

@@ -18,11 +18,7 @@ declare namespace monaco.languages.html {
 		readonly indentHandlebars: boolean;
 		readonly endWithNewline: boolean;
 		readonly extraLiners: string;
-		readonly wrapAttributes:
+		readonly wrapAttributes: 'auto' | 'force' | 'force-aligned' | 'force-expand-multiline';
-			| 'auto'
-			| 'force'
-			| 'force-aligned'
-			| 'force-expand-multiline';
 	}
 	export interface CompletionConfiguration {
 		[provider: string]: boolean;

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "monaco-html",
-	"version": "3.0.0",
+	"version": "3.1.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -411,15 +411,15 @@
 			}
 		},
 		"monaco-editor-core": {
-			"version": "0.20.0",
+			"version": "0.21.0",
-			"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.20.0.tgz",
+			"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.21.0.tgz",
-			"integrity": "sha512-4mdmfEejTvRZzrEIn70jqqNl3g15vnkRdTkJ8uMK4jiljntlwhiSc5vknZOLt1QM8za16C3tDrSl2mTL9ma2Sg==",
+			"integrity": "sha512-buBxOxwexlb7pdQrIHjj7OGmtVmEe735NN7M8GbhN03eYAKQmaeIAs1AyneOOHvbvh1Ntm7PoHH8f196gd2p6w==",
 			"dev": true
 		},
 		"monaco-languages": {
-			"version": "1.10.0",
+			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.10.0.tgz",
+			"resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-2.1.0.tgz",
-			"integrity": "sha512-ARAws17Xh0K4WsZYkJY6CqHn9EYdYN8CjzK6w/jgXIwU0owzCdUWxzu+FNJ/LeDLcKxL/YK3phcwGFj9IqX2yw==",
+			"integrity": "sha512-c2afUp3lbUCrvEdVrH8EThQYbj5tb2FpvXFnFN3gOJScDlFknWb5nbaxiaVqY9CSIqzJVZpNc5HXpP5FWOuS3g==",
 			"dev": true
 		},
 		"monaco-plugin-helpers": {
@@ -573,15 +573,15 @@
 			}
 		},
 		"prettier": {
-			"version": "2.1.1",
+			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz",
-			"integrity": "sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==",
+			"integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==",
 			"dev": true
 		},
 		"pretty-quick": {
-			"version": "3.0.0",
+			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.0.2.tgz",
-			"integrity": "sha512-oIXlGQUcUxt3XpoNfQECEWvH1Q9PtKfelF2pdp6UvC1CSQ5QcB7gUYKu0kuJGlm3LMBZzJaO/vbRkxA61pWlcg==",
+			"integrity": "sha512-4rWOs/Ifdkg7G/YX7Xbco4jZkuXPx445KdhuMI6REnl3nXRDb9+zysb29c76R59jsJzcnkcpAaGi8D/RjAVfSQ==",
 			"dev": true,
 			"requires": {
 				"chalk": "^3.0.0",
@@ -697,9 +697,9 @@
 			}
 		},
 		"terser": {
-			"version": "5.3.0",
+			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-5.3.2.tgz",
-			"integrity": "sha512-XTT3D3AwxC54KywJijmY2mxZ8nJiEjBHVYzq8l9OaYuRFWeQNBwvipuzzYEP4e+/AVcd1hqG/CqgsdIRyT45Fg==",
+			"integrity": "sha512-H67sydwBz5jCUA32ZRL319ULu+Su1cAoZnnc+lXnenGRYWyLE3Scgkt8mNoAsMx0h5kdo758zdoS0LG9rYZXDQ==",
 			"dev": true,
 			"requires": {
 				"commander": "^2.20.0",
@@ -708,20 +708,20 @@
 			}
 		},
 		"typescript": {
-			"version": "4.0.2",
+			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz",
+			"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz",
-			"integrity": "sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==",
+			"integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==",
 			"dev": true
 		},
 		"vscode-html-languageservice": {
-			"version": "3.1.2",
+			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-3.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-3.1.3.tgz",
-			"integrity": "sha512-ixdcyb2xBmwNTuMitT6vNbnvHCnATim1ZZC/CxiUtzKImQjuXAT5Px53x/7+zUqGU9RlfkEwHN//slWcCBMdMw==",
+			"integrity": "sha512-ViGIfK7D3E99dFXprTenz20M8xzb0+fsAMPSPpz5JrHyBU7hdx+0cc/angDqdSygYMOm8vkbTviXwPtg6P3hhg==",
 			"dev": true,
 			"requires": {
 				"vscode-languageserver-textdocument": "^1.0.1",
 				"vscode-languageserver-types": "3.16.0-next.2",
-				"vscode-nls": "^4.1.2",
+				"vscode-nls": "^5.0.0",
 				"vscode-uri": "^2.1.2"
 			},
 			"dependencies": {
@@ -746,9 +746,9 @@
 			"dev": true
 		},
 		"vscode-nls": {
-			"version": "4.1.2",
+			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz",
-			"integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==",
+			"integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==",
 			"dev": true
 		},
 		"vscode-uri": {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "monaco-html",
-	"version": "3.0.0",
+	"version": "3.1.0",
 	"description": "HTML plugin for the Monaco Editor",
 	"scripts": {
 		"compile": "mrmdir ./out && tsc -p ./src/tsconfig.json && tsc -p ./src/tsconfig.esm.json && node ./scripts/dts && prettier --write ./monaco.d.ts",
@@ -23,15 +23,15 @@
 	"typings": "./release/esm/monaco.contribution.d.ts",
 	"devDependencies": {
 		"husky": "^4.3.0",
-		"monaco-editor-core": "0.20.0",
+		"monaco-editor-core": "0.21.0",
-		"monaco-languages": "^1.10.0",
+		"monaco-languages": "^2.1.0",
 		"monaco-plugin-helpers": "^1.0.3",
-		"prettier": "^2.1.1",
+		"prettier": "^2.1.2",
-		"pretty-quick": "^3.0.0",
+		"pretty-quick": "^3.0.2",
 		"requirejs": "^2.3.6",
-		"typescript": "^4.0.2",
+		"typescript": "^4.0.3",
-		"terser": "^5.3.0",
+		"terser": "^5.3.2",
-		"vscode-html-languageservice": "3.1.2",
+		"vscode-html-languageservice": "3.1.3",
 		"vscode-languageserver-types": "3.15.1",
 		"vscode-languageserver-textdocument": "^1.0.1"
 	},

scripts/bundle.js

@@ -40,26 +40,17 @@ function bundleOne(moduleId, exclude) {
 			packages: [
 				{
 					name: 'vscode-html-languageservice',
-					location: path.join(
+					location: path.join(REPO_ROOT, 'node_modules/vscode-html-languageservice/lib/umd'),
-						REPO_ROOT,
-						'node_modules/vscode-html-languageservice/lib/umd'
-					),
 					main: 'htmlLanguageService'
 				},
 				{
 					name: 'vscode-languageserver-types',
-					location: path.join(
+					location: path.join(REPO_ROOT, 'node_modules/vscode-languageserver-types/lib/umd'),
-						REPO_ROOT,
-						'node_modules/vscode-languageserver-types/lib/umd'
-					),
 					main: 'main'
 				},
 				{
 					name: 'vscode-languageserver-textdocument',
-					location: path.join(
+					location: path.join(REPO_ROOT, 'node_modules/vscode-languageserver-textdocument/lib/umd'),
-						REPO_ROOT,
-						'node_modules/vscode-languageserver-textdocument/lib/umd'
-					),
 					main: 'main'
 				},
 				{
@@ -75,14 +66,8 @@ function bundleOne(moduleId, exclude) {
 			]
 		},
 		async function (buildResponse) {
-			const devFilePath = path.join(
+			const devFilePath = path.join(REPO_ROOT, 'release/dev/' + moduleId + '.js');
-				REPO_ROOT,
+			const minFilePath = path.join(REPO_ROOT, 'release/min/' + moduleId + '.js');
-				'release/dev/' + moduleId + '.js'
-			);
-			const minFilePath = path.join(
-				REPO_ROOT,
-				'release/min/' + moduleId + '.js'
-			);
 			const fileContents = fs.readFileSync(devFilePath).toString();
 			console.log();
 			console.log(`Minifying ${devFilePath}...`);

src/fillers/vscode-nls.ts

@@ -33,11 +33,7 @@ function format(message: string, args: any[]): string {
 	return result;
 }
 
-function localize(
+function localize(key: string | LocalizeInfo, message: string, ...args: any[]): string {
-	key: string | LocalizeInfo,
-	message: string,
-	...args: any[]
-): string {
 	return format(message, args);
 }
 

src/htmlMode.ts

@@ -12,9 +12,7 @@ import { Uri, IDisposable, languages } from './fillers/monaco-editor-core';
 export function setupMode1(defaults: LanguageServiceDefaults): void {
 	const client = new WorkerManager(defaults);
 
-	const worker: languageFeatures.WorkerAccessor = (
+	const worker: languageFeatures.WorkerAccessor = (...uris: Uri[]): Promise<HTMLWorker> => {
-		...uris: Uri[]
-	): Promise<HTMLWorker> => {
 		return client.getLanguageServiceWorker(...uris);
 	};
 
@@ -25,19 +23,13 @@ export function setupMode1(defaults: LanguageServiceDefaults): void {
 		languageId,
 		new languageFeatures.CompletionAdapter(worker)
 	);
-	languages.registerHoverProvider(
+	languages.registerHoverProvider(languageId, new languageFeatures.HoverAdapter(worker));
-		languageId,
-		new languageFeatures.HoverAdapter(worker)
-	);
 
 	languages.registerDocumentHighlightProvider(
 		languageId,
 		new languageFeatures.DocumentHighlightAdapter(worker)
 	);
-	languages.registerLinkProvider(
+	languages.registerLinkProvider(languageId, new languageFeatures.DocumentLinkAdapter(worker));
-		languageId,
-		new languageFeatures.DocumentLinkAdapter(worker)
-	);
 	languages.registerFoldingRangeProvider(
 		languageId,
 		new languageFeatures.FoldingRangeAdapter(worker)
@@ -50,10 +42,7 @@ export function setupMode1(defaults: LanguageServiceDefaults): void {
 		languageId,
 		new languageFeatures.SelectionRangeAdapter(worker)
 	);
-	languages.registerRenameProvider(
+	languages.registerRenameProvider(languageId, new languageFeatures.RenameAdapter(worker));
-		languageId,
-		new languageFeatures.RenameAdapter(worker)
-	);
 
 	// only html
 	if (languageId === 'html') {
@@ -76,9 +65,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
 	const client = new WorkerManager(defaults);
 	disposables.push(client);
 
-	const worker: languageFeatures.WorkerAccessor = (
+	const worker: languageFeatures.WorkerAccessor = (...uris: Uri[]): Promise<HTMLWorker> => {
-		...uris: Uri[]
-	): Promise<HTMLWorker> => {
 		return client.getLanguageServiceWorker(...uris);
 	};
 
@@ -97,10 +84,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
 		}
 		if (modeConfiguration.hovers) {
 			providers.push(
-				languages.registerHoverProvider(
+				languages.registerHoverProvider(languageId, new languageFeatures.HoverAdapter(worker))
-					languageId,
-					new languageFeatures.HoverAdapter(worker)
-				)
 			);
 		}
 		if (modeConfiguration.documentHighlights) {
@@ -113,10 +97,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
 		}
 		if (modeConfiguration.links) {
 			providers.push(
-				languages.registerLinkProvider(
+				languages.registerLinkProvider(languageId, new languageFeatures.DocumentLinkAdapter(worker))
-					languageId,
-					new languageFeatures.DocumentLinkAdapter(worker)
-				)
 			);
 		}
 		if (modeConfiguration.documentSymbols) {
@@ -129,10 +110,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
 		}
 		if (modeConfiguration.rename) {
 			providers.push(
-				languages.registerRenameProvider(
+				languages.registerRenameProvider(languageId, new languageFeatures.RenameAdapter(worker))
-					languageId,
-					new languageFeatures.RenameAdapter(worker)
-				)
 			);
 		}
 		if (modeConfiguration.foldingRanges) {
@@ -168,9 +146,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
 			);
 		}
 		if (modeConfiguration.diagnostics) {
-			providers.push(
+			providers.push(new languageFeatures.DiagnosticsAdapter(languageId, worker, defaults));
-				new languageFeatures.DiagnosticsAdapter(languageId, worker, defaults)
-			);
 		}
 	}
 

src/htmlWorker.ts

@@ -52,10 +52,7 @@ export class HTMLWorker {
 		);
 		return Promise.resolve(textEdits);
 	}
-	async doHover(
+	async doHover(uri: string, position: htmlService.Position): Promise<htmlService.Hover> {
-		uri: string,
-		position: htmlService.Position
-	): Promise<htmlService.Hover> {
 		let document = this._getTextDocument(uri);
 		let htmlDocument = this._languageService.parseHTMLDocument(document);
 		let hover = this._languageService.doHover(document, position, htmlDocument);
@@ -67,11 +64,7 @@ export class HTMLWorker {
 	): Promise<htmlService.DocumentHighlight[]> {
 		let document = this._getTextDocument(uri);
 		let htmlDocument = this._languageService.parseHTMLDocument(document);
-		let highlights = this._languageService.findDocumentHighlights(
+		let highlights = this._languageService.findDocumentHighlights(document, position, htmlDocument);
-			document,
-			position,
-			htmlDocument
-		);
 		return Promise.resolve(highlights);
 	}
 	async findDocumentLinks(uri: string): Promise<htmlService.DocumentLink[]> {
@@ -79,15 +72,10 @@ export class HTMLWorker {
 		let links = this._languageService.findDocumentLinks(document, null);
 		return Promise.resolve(links);
 	}
-	async findDocumentSymbols(
+	async findDocumentSymbols(uri: string): Promise<htmlService.SymbolInformation[]> {
-		uri: string
-	): Promise<htmlService.SymbolInformation[]> {
 		let document = this._getTextDocument(uri);
 		let htmlDocument = this._languageService.parseHTMLDocument(document);
-		let symbols = this._languageService.findDocumentSymbols(
+		let symbols = this._languageService.findDocumentSymbols(document, htmlDocument);
-			document,
-			htmlDocument
-		);
 		return Promise.resolve(symbols);
 	}
 	async getFoldingRanges(
@@ -113,12 +101,7 @@ export class HTMLWorker {
 	): Promise<htmlService.WorkspaceEdit> {
 		let document = this._getTextDocument(uri);
 		let htmlDocument = this._languageService.parseHTMLDocument(document);
-		let renames = this._languageService.doRename(
+		let renames = this._languageService.doRename(document, position, newName, htmlDocument);
-			document,
-			position,
-			newName,
-			htmlDocument
-		);
 		return Promise.resolve(renames);
 	}
 	private _getTextDocument(uri: string): htmlService.TextDocument {
@@ -142,9 +125,6 @@ export interface ICreateData {
 	languageSettings: Options;
 }
 
-export function create(
+export function create(ctx: worker.IWorkerContext, createData: ICreateData): HTMLWorker {
-	ctx: worker.IWorkerContext,
-	createData: ICreateData
-): HTMLWorker {
 	return new HTMLWorker(ctx, createData);
 }

src/languageFeatures.ts

@@ -104,11 +104,7 @@ export class DiagnosticsAdapter {
 			.then((worker) => {
 				return worker.doValidation(resource.toString()).then((diagnostics) => {
 					const markers = diagnostics.map((d) => toDiagnostics(resource, d));
-					editor.setModelMarkers(
+					editor.setModelMarkers(editor.getModel(resource), languageId, markers);
-						editor.getModel(resource),
-						languageId,
-						markers
-					);
 				});
 			})
 			.then(undefined, (err) => {
@@ -132,12 +128,8 @@ function toSeverity(lsSeverity: number): MarkerSeverity {
 	}
 }
 
-function toDiagnostics(
+function toDiagnostics(resource: Uri, diag: htmlService.Diagnostic): editor.IMarkerData {
-	resource: Uri,
+	const code = typeof diag.code === 'number' ? String(diag.code) : <string>diag.code;
-	diag: htmlService.Diagnostic
-): editor.IMarkerData {
-	const code =
-		typeof diag.code === 'number' ? String(diag.code) : <string>diag.code;
 
 	return {
 		severity: toSeverity(diag.severity),
@@ -182,9 +174,7 @@ function toRange(range: htmlService.Range): Range {
 	);
 }
 
-function isInsertReplaceEdit(
+function isInsertReplaceEdit(edit: TextEdit | InsertReplaceEdit): edit is InsertReplaceEdit {
-	edit: TextEdit | InsertReplaceEdit
-): edit is InsertReplaceEdit {
 	return (
 		typeof (<InsertReplaceEdit>edit).insert !== 'undefined' &&
 		typeof (<InsertReplaceEdit>edit).replace !== 'undefined'
@@ -281,9 +271,7 @@ function fromCompletionItemKind(
 	return htmlService.CompletionItemKind.Property;
 }
 
-function toTextEdit(
+function toTextEdit(textEdit: htmlService.TextEdit): editor.ISingleEditOperation {
-	textEdit: htmlService.TextEdit
-): editor.ISingleEditOperation {
 	if (!textEdit) {
 		return void 0;
 	}
@@ -347,13 +335,10 @@ export class CompletionAdapter implements languages.CompletionItemProvider {
 						item.insertText = entry.textEdit.newText;
 					}
 					if (entry.additionalTextEdits) {
-						item.additionalTextEdits = entry.additionalTextEdits.map(
+						item.additionalTextEdits = entry.additionalTextEdits.map(toTextEdit);
-							toTextEdit
-						);
 					}
 					if (entry.insertTextFormat === htmlService.InsertTextFormat.Snippet) {
-						item.insertTextRules =
+						item.insertTextRules = languages.CompletionItemInsertTextRule.InsertAsSnippet;
-							languages.CompletionItemInsertTextRule.InsertAsSnippet;
 					}
 					return item;
 				});
@@ -399,10 +384,7 @@ function toMarkdownString(
 }
 
 function toMarkedStringArray(
-	contents:
+	contents: htmlService.MarkupContent | htmlService.MarkedString | htmlService.MarkedString[]
-		| htmlService.MarkupContent
-		| htmlService.MarkedString
-		| htmlService.MarkedString[]
 ): IMarkdownString[] {
 	if (!contents) {
 		return void 0;
@@ -441,9 +423,7 @@ export class HoverAdapter implements languages.HoverProvider {
 
 // --- document highlights ------
 
-function toHighlighKind(
+function toHighlighKind(kind: htmlService.DocumentHighlightKind): languages.DocumentHighlightKind {
-	kind: htmlService.DocumentHighlightKind
-): languages.DocumentHighlightKind {
 	const mKind = languages.DocumentHighlightKind;
 
 	switch (kind) {
@@ -457,8 +437,7 @@ function toHighlighKind(
 	return mKind.Text;
 }
 
-export class DocumentHighlightAdapter
+export class DocumentHighlightAdapter implements languages.DocumentHighlightProvider {
-	implements languages.DocumentHighlightProvider {
 	constructor(private _worker: WorkerAccessor) {}
 
 	public provideDocumentHighlights(
@@ -469,12 +448,7 @@ export class DocumentHighlightAdapter
 		const resource = model.uri;
 
 		return this._worker(resource)
-			.then((worker) =>
+			.then((worker) => worker.findDocumentHighlights(resource.toString(), fromPosition(position)))
-				worker.findDocumentHighlights(
-					resource.toString(),
-					fromPosition(position)
-				)
-			)
 			.then((items) => {
 				if (!items) {
 					return;
@@ -595,8 +569,7 @@ function fromFormattingOptions(
 	};
 }
 
-export class DocumentFormattingEditProvider
+export class DocumentFormattingEditProvider implements languages.DocumentFormattingEditProvider {
-	implements languages.DocumentFormattingEditProvider {
 	constructor(private _worker: WorkerAccessor) {}
 
 	public provideDocumentFormattingEdits(
@@ -633,11 +606,7 @@ export class DocumentRangeFormattingEditProvider
 
 		return this._worker(resource).then((worker) => {
 			return worker
-				.format(
+				.format(resource.toString(), fromRange(range), fromFormattingOptions(options))
-					resource.toString(),
-					fromRange(range),
-					fromFormattingOptions(options)
-				)
 				.then((edits) => {
 					if (!edits || edits.length === 0) {
 						return;
@@ -661,11 +630,7 @@ export class RenameAdapter implements languages.RenameProvider {
 
 		return this._worker(resource)
 			.then((worker) => {
-				return worker.doRename(
+				return worker.doRename(resource.toString(), fromPosition(position), newName);
-					resource.toString(),
-					fromPosition(position),
-					newName
-				);
 			})
 			.then((edit) => {
 				return toWorkspaceEdit(edit);
@@ -673,9 +638,7 @@ export class RenameAdapter implements languages.RenameProvider {
 	}
 }
 
-function toWorkspaceEdit(
+function toWorkspaceEdit(edit: htmlService.WorkspaceEdit): languages.WorkspaceEdit {
-	edit: htmlService.WorkspaceEdit
-): languages.WorkspaceEdit {
 	if (!edit || !edit.changes) {
 		return void 0;
 	}
@@ -719,9 +682,7 @@ export class FoldingRangeAdapter implements languages.FoldingRangeProvider {
 						end: range.endLine + 1
 					};
 					if (typeof range.kind !== 'undefined') {
-						result.kind = toFoldingRangeKind(
+						result.kind = toFoldingRangeKind(<htmlService.FoldingRangeKind>range.kind);
-							<htmlService.FoldingRangeKind>range.kind
-						);
 					}
 					return result;
 				});
@@ -729,9 +690,7 @@ export class FoldingRangeAdapter implements languages.FoldingRangeProvider {
 	}
 }
 
-function toFoldingRangeKind(
+function toFoldingRangeKind(kind: htmlService.FoldingRangeKind): languages.FoldingRangeKind {
-	kind: htmlService.FoldingRangeKind
-): languages.FoldingRangeKind {
 	switch (kind) {
 		case htmlService.FoldingRangeKind.Comment:
 			return languages.FoldingRangeKind.Comment;
@@ -753,12 +712,7 @@ export class SelectionRangeAdapter implements languages.SelectionRangeProvider {
 		const resource = model.uri;
 
 		return this._worker(resource)
-			.then((worker) =>
+			.then((worker) => worker.getSelectionRanges(resource.toString(), positions.map(fromPosition)))
-				worker.getSelectionRanges(
-					resource.toString(),
-					positions.map(fromPosition)
-				)
-			)
 			.then((selectionRanges) => {
 				if (!selectionRanges) {
 					return;

src/monaco.contribution.ts

@@ -18,11 +18,7 @@ export interface HTMLFormatConfiguration {
 	readonly indentHandlebars: boolean;
 	readonly endWithNewline: boolean;
 	readonly extraLiners: string;
-	readonly wrapAttributes:
+	readonly wrapAttributes: 'auto' | 'force' | 'force-aligned' | 'force-expand-multiline';
-		| 'auto'
-		| 'force'
-		| 'force-aligned'
-		| 'force-expand-multiline';
 }
 
 export interface CompletionConfiguration {
@@ -118,11 +114,7 @@ class LanguageServiceDefaultsImpl implements LanguageServiceDefaults {
 	private _modeConfiguration: ModeConfiguration;
 	private _languageId: string;
 
-	constructor(
+	constructor(languageId: string, options: Options, modeConfiguration: ModeConfiguration) {
-		languageId: string,
-		options: Options,
-		modeConfiguration: ModeConfiguration
-	) {
 		this._languageId = languageId;
 		this.setOptions(options);
 		this.setModeConfiguration(modeConfiguration);
@@ -186,9 +178,7 @@ const razorOptionsDefault: Required<Options> = {
 	suggest: { html5: true, razor: true }
 };
 
-function getConfigurationDefault(
+function getConfigurationDefault(languageId: string): Required<ModeConfiguration> {
-	languageId: string
-): Required<ModeConfiguration> {
 	return {
 		completionItems: true,
 		hovers: true,

src/tsconfig.esm.json

@@ -5,12 +5,6 @@
 		"outDir": "../out/esm",
 		"declaration": true,
 		"target": "es5",
-		"lib": [
+		"lib": ["dom", "es5", "es2015.collection", "es2015.promise", "es2015.iterable"]
-			"dom",
-			"es5",
-			"es2015.collection",
-			"es2015.promise",
-			"es2015.iterable"
-		]
 	}
 }

src/tsconfig.json

@@ -5,12 +5,6 @@
 		"outDir": "../out/amd",
 		"declaration": true,
 		"target": "es5",
-		"lib": [
+		"lib": ["dom", "es5", "es2015.collection", "es2015.promise", "es2015.iterable"]
-			"dom",
-			"es5",
-			"es2015.collection",
-			"es2015.promise",
-			"es2015.iterable"
-		]
 	}
 }

src/workerManager.ts

@@ -23,9 +23,7 @@ export class WorkerManager {
 		this._worker = null;
 		this._idleCheckInterval = setInterval(() => this._checkIfIdle(), 30 * 1000);
 		this._lastUsedTime = 0;
-		this._configChangeListener = this._defaults.onDidChange(() =>
+		this._configChangeListener = this._defaults.onDidChange(() => this._stopWorker());
-			this._stopWorker()
-		);
 	}
 
 	private _stopWorker(): void {

test/index.html

@@ -11,10 +11,7 @@
 	</head>
 	<body>
 		<h2>Monaco Editor HTML test page</h2>
-		<div
+		<div id="container" style="width: 800px; height: 600px; border: 1px solid grey"></div>
-			id="container"
-			style="width: 800px; height: 600px; border: 1px solid grey"
-		></div>
 
 		<script>
 			// Loading basic-languages to get the html language definition
@@ -44,37 +41,34 @@
 				'vs/basic-languages/monaco.contribution',
 				'vs/language/html/monaco.contribution'
 			], function () {
-				var editor = monaco.editor.create(
+				var editor = monaco.editor.create(document.getElementById('container'), {
-					document.getElementById('container'),
+					value: [
-					{
+						'<!DOCTYPE HTML>',
-						value: [
+						'<!--',
-							'<!DOCTYPE HTML>',
+						'	Comments are overrated',
-							'<!--',
+						'-->',
-							'	Comments are overrated',
+						'<html>',
-							'-->',
+						'<head>',
-							'<html>',
+						'	<title>HTML Sample</title>',
-							'<head>',
+						'	<meta http-equiv="X-UA-Compatible" content="IE=edge">',
-							'	<title>HTML Sample</title>',
+						'	<style type="text/css">',
-							'	<meta http-equiv="X-UA-Compatible" content="IE=edge">',
+						'		h1 {',
-							'	<style type="text/css">',
+						'			color: #CCA3A3;',
-							'		h1 {',
+						'		}',
-							'			color: #CCA3A3;',
+						'	</style>',
-							'		}',
+						'	<script type="text/javascript">',
-							'	</style>',
+						'		window.alert("I am a sample...");',
-							'	<script type="text/javascript">',
+						'		var x = 3;',
-							'		window.alert("I am a sample...");',
+						'	</' + 'script>',
-							'		var x = 3;',
+						'</head>',
-							'	</' + 'script>',
+						'<body>',
-							'</head>',
+						'	<h1>Heading No.1</h1>',
-							'<body>',
+						'	<input disabled type="button" value="Click me" />',
-							'	<h1>Heading No.1</h1>',
+						'</body>',
-							'	<input disabled type="button" value="Click me" />',
+						'</html>'
-							'</body>',
+					].join('\n'),
-							'</html>'
+					language: 'html'
-						].join('\n'),
+				});
-						language: 'html'
-					}
-				);
 			});
 		</script>
 	</body>