Prefer using template strings instead of strings.format

mjbvz · mjbvz · commit 6b6e73b3e771 · 2018-12-10T17:14:00.000-08:00
diff --git a/src/vs/editor/contrib/codelens/codelensWidget.ts b/src/vs/editor/contrib/codelens/codelensWidget.ts
@@ -6,7 +6,7 @@
 import 'vs/css!./codelensWidget';
 import * as dom from 'vs/base/browser/dom';
 import { coalesce, isFalsyOrEmpty } from 'vs/base/common/arrays';
-import { escape, format } from 'vs/base/common/strings';
+import { escape } from 'vs/base/common/strings';
 import * as editorBrowser from 'vs/editor/browser/editorBrowser';
 import { Range } from 'vs/editor/common/core/range';
 import { IModelDecorationsChangeAccessor, IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
@@ -109,10 +109,10 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
 			let title = escape(command.title);
 			let part: string;
 			if (command.id) {
-				part = format('<a id={0}>{1}</a>', i, title);
+				part = `<a id=${i}>${title}</a>`;
 				this._commands[i] = command;
 			} else {
-				part = format('<span>{0}</span>', title);
+				part = `<span>${title}</span>`;
 			}
 			html.push(part);
 		}
diff --git a/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts b/src/vs/editor/contrib/referenceSearch/peekViewWidget.ts
@@ -186,11 +186,11 @@ export abstract class PeekViewWidget extends ZoneWidget {
 	}
 
 	protected _doLayoutHead(heightInPixel: number, widthInPixel: number): void {
-		this._headElement.style.height = strings.format('{0}px', heightInPixel);
+		this._headElement.style.height = `${heightInPixel}px`;
 		this._headElement.style.lineHeight = this._headElement.style.height;
 	}
 
 	protected _doLayoutBody(heightInPixel: number, widthInPixel: number): void {
-		this._bodyElement.style.height = strings.format('{0}px', heightInPixel);
+		this._bodyElement.style.height = `${heightInPixel}px`;
 	}
 }
diff --git a/src/vs/workbench/browser/parts/compositePart.ts b/src/vs/workbench/browser/parts/compositePart.ts
@@ -183,7 +183,7 @@ export abstract class CompositePart<T extends Composite> extends Part {
 			return composite;
 		}
 
-		throw new Error(strings.format('Unable to find composite with id {0}', id));
+		throw new Error(`Unable to find composite with id ${id}`);
 	}
 
 	protected showComposite(composite: Composite): void {
diff --git a/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts b/src/vs/workbench/services/files/node/watcher/unix/chokidarWatcherService.ts
@@ -11,7 +11,6 @@ import * as paths from 'vs/base/common/paths';
 import * as glob from 'vs/base/common/glob';
 import { FileChangeType } from 'vs/platform/files/common/files';
 import { ThrottledDelayer } from 'vs/base/common/async';
-import * as strings from 'vs/base/common/strings';
 import { normalizeNFC } from 'vs/base/common/normalization';
 import { realcaseSync } from 'vs/base/node/extfs';
 import { isMacintosh } from 'vs/base/common/platform';
@@ -220,7 +219,7 @@ export class ChokidarWatcherService implements IWatcherService {
 				this.spamCheckStartTime = now;
 			} else if (!this.spamWarningLogged && this.spamCheckStartTime + ChokidarWatcherService.EVENT_SPAM_WARNING_THRESHOLD < now) {
 				this.spamWarningLogged = true;
-				console.warn(strings.format('Watcher is busy catching up with {0} file changes in 60 seconds. Latest changed path is "{1}"', undeliveredFileEvents.length, event.path));
+				console.warn(`Watcher is busy catching up with ${undeliveredFileEvents.length} file changes in 60 seconds. Latest changed path is "${event.path}"`);
 			}
 
 			// Add to buffer

Original file line number	Diff line number	Diff line change
`@@ -186,11 +186,11 @@ export abstract class PeekViewWidget extends ZoneWidget {`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`protected _doLayoutHead(heightInPixel: number, widthInPixel: number): void {`
`189`		`- this._headElement.style.height = strings.format('{0}px', heightInPixel);`
	`189`	+ this._headElement.style.height = `${heightInPixel}px`;
`190`	`190`	`this._headElement.style.lineHeight = this._headElement.style.height;`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`protected _doLayoutBody(heightInPixel: number, widthInPixel: number): void {`
`194`		`- this._bodyElement.style.height = strings.format('{0}px', heightInPixel);`
	`194`	+ this._bodyElement.style.height = `${heightInPixel}px`;
`195`	`195`	`}`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ export abstract class CompositePart<T extends Composite> extends Part {`
`183`	`183`	`return composite;`
`184`	`184`	`}`
`185`	`185`
`186`		`- throw new Error(strings.format('Unable to find composite with id {0}', id));`
	`186`	+ throw new Error(`Unable to find composite with id ${id}`);
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`protected showComposite(composite: Composite): void {`