Build VS code using TS 3.7-beta

mjbvz · mjbvz · commit 11f24f64e735 · 2019-10-10T14:16:26.000-07:00
Fixes microsoft#82286
diff --git a/build/package.json b/build/package.json
@@ -42,7 +42,7 @@
     "request": "^2.85.0",
     "terser": "4.3.8",
     "tslint": "^5.9.1",
-    "typescript": "3.6.2",
+    "typescript": "3.7.0-beta",
     "vsce": "1.48.0",
     "vscode-telemetry-extractor": "^1.5.4",
     "xml2js": "^0.4.17"
diff --git a/build/yarn.lock b/build/yarn.lock
@@ -2297,10 +2297,10 @@ typed-rest-client@^0.9.0:
     tunnel "0.0.4"
     underscore "1.8.3"
 
-typescript@3.6.2:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.2.tgz#105b0f1934119dde543ac8eb71af3a91009efe54"
-  integrity sha512-lmQ4L+J6mnu3xweP8+rOrUwzmN+MRAj7TgtJtDaXE5PMyX2kCrklhg3rvOsOIfNeAWMQWO2F1GPc1kMD2vLAfw==
+typescript@3.7.0-beta:
+  version "3.7.0-beta"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.0-beta.tgz#4ad556e0eee14b90ecc39261001690e16e5eeba9"
+  integrity sha512-4jyCX+IQamrPJxgkABPq9xf+hUN+GWHVxoj+oey1TadCPa4snQl1RKwUba+1dyzYCamwlCxKvZQ3TjyWLhMGBA==
 
 typescript@^3.0.1:
   version "3.5.3"
diff --git a/package.json b/package.json
@@ -127,7 +127,7 @@
     "source-map": "^0.4.4",
     "ts-loader": "^4.4.2",
     "tslint": "^5.16.0",
-    "typescript": "3.6",
+    "typescript": "3.7.0-beta",
     "typescript-formatter": "7.1.0",
     "underscore": "^1.8.2",
     "vinyl": "^2.0.0",
diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts
@@ -568,7 +568,6 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview,
 
 	public layout(): void {
 		// noop
-
 	}
 
 	private readonly _hasFindResult = this._register(new Emitter<boolean>());
@@ -630,60 +629,42 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview,
 	}
 
 	public showFind() {
-		if (this._webviewFindWidget) {
-			this._webviewFindWidget.reveal();
-		}
+		this._webviewFindWidget?.reveal();
 	}
 
 	public hideFind() {
-		if (this._webviewFindWidget) {
-			this._webviewFindWidget.hide();
-		}
+		this._webviewFindWidget?.hide();
 	}
 
 	public runFindAction(previous: boolean) {
-		if (this._webviewFindWidget) {
-			this._webviewFindWidget.find(previous);
-		}
+		this._webviewFindWidget?.find(previous);
 	}
 
 	public reload() {
 		this.doUpdateContent();
 	}
 
 	public selectAll() {
-		if (this._webview) {
-			this._webview.selectAll();
-		}
+		this._webview?.selectAll();
 	}
 
 	public copy() {
-		if (this._webview) {
-			this._webview.copy();
-		}
+		this._webview?.copy();
 	}
 
 	public paste() {
-		if (this._webview) {
-			this._webview.paste();
-		}
+		this._webview?.paste();
 	}
 
 	public cut() {
-		if (this._webview) {
-			this._webview.cut();
-		}
+		this._webview?.cut();
 	}
 
 	public undo() {
-		if (this._webview) {
-			this._webview.undo();
-		}
+		this._webview?.undo();
 	}
 
 	public redo() {
-		if (this._webview) {
-			this._webview.redo();
-		}
+		this._webview?.redo();
 	}
 }
diff --git a/yarn.lock b/yarn.lock
@@ -8515,10 +8515,10 @@ typescript-formatter@7.1.0:
     commandpost "^1.0.0"
     editorconfig "^0.15.0"
 
-typescript@3.6:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.2.tgz#105b0f1934119dde543ac8eb71af3a91009efe54"
-  integrity sha512-lmQ4L+J6mnu3xweP8+rOrUwzmN+MRAj7TgtJtDaXE5PMyX2kCrklhg3rvOsOIfNeAWMQWO2F1GPc1kMD2vLAfw==
+typescript@3.7.0-beta:
+  version "3.7.0-beta"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.0-beta.tgz#4ad556e0eee14b90ecc39261001690e16e5eeba9"
+  integrity sha512-4jyCX+IQamrPJxgkABPq9xf+hUN+GWHVxoj+oey1TadCPa4snQl1RKwUba+1dyzYCamwlCxKvZQ3TjyWLhMGBA==
 
 typescript@^2.6.2:
   version "2.6.2"

Original file line number	Diff line number	Diff line change
`@@ -568,7 +568,6 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview,`
`568`	`568`
`569`	`569`	`public layout(): void {`
`570`	`570`	`// noop`
`571`		`-`
`572`	`571`	`}`
`573`	`572`
`574`	`573`	`private readonly _hasFindResult = this._register(new Emitter<boolean>());`
`@@ -630,60 +629,42 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview,`
`630`	`629`	`}`
`631`	`630`
`632`	`631`	`public showFind() {`
`633`		`- if (this._webviewFindWidget) {`
`634`		`- this._webviewFindWidget.reveal();`
`635`		`- }`
	`632`	`+ this._webviewFindWidget?.reveal();`
`636`	`633`	`}`
`637`	`634`
`638`	`635`	`public hideFind() {`
`639`		`- if (this._webviewFindWidget) {`
`640`		`- this._webviewFindWidget.hide();`
`641`		`- }`
	`636`	`+ this._webviewFindWidget?.hide();`
`642`	`637`	`}`
`643`	`638`
`644`	`639`	`public runFindAction(previous: boolean) {`
`645`		`- if (this._webviewFindWidget) {`
`646`		`- this._webviewFindWidget.find(previous);`
`647`		`- }`
	`640`	`+ this._webviewFindWidget?.find(previous);`
`648`	`641`	`}`
`649`	`642`
`650`	`643`	`public reload() {`
`651`	`644`	`this.doUpdateContent();`
`652`	`645`	`}`
`653`	`646`
`654`	`647`	`public selectAll() {`
`655`		`- if (this._webview) {`
`656`		`- this._webview.selectAll();`
`657`		`- }`
	`648`	`+ this._webview?.selectAll();`
`658`	`649`	`}`
`659`	`650`
`660`	`651`	`public copy() {`
`661`		`- if (this._webview) {`
`662`		`- this._webview.copy();`
`663`		`- }`
	`652`	`+ this._webview?.copy();`
`664`	`653`	`}`
`665`	`654`
`666`	`655`	`public paste() {`
`667`		`- if (this._webview) {`
`668`		`- this._webview.paste();`
`669`		`- }`
	`656`	`+ this._webview?.paste();`
`670`	`657`	`}`
`671`	`658`
`672`	`659`	`public cut() {`
`673`		`- if (this._webview) {`
`674`		`- this._webview.cut();`
`675`		`- }`
	`660`	`+ this._webview?.cut();`
`676`	`661`	`}`
`677`	`662`
`678`	`663`	`public undo() {`
`679`		`- if (this._webview) {`
`680`		`- this._webview.undo();`
`681`		`- }`
	`664`	`+ this._webview?.undo();`
`682`	`665`	`}`
`683`	`666`
`684`	`667`	`public redo() {`
`685`		`- if (this._webview) {`
`686`		`- this._webview.redo();`
`687`		`- }`
	`668`	`+ this._webview?.redo();`
`688`	`669`	`}`
`689`	`670`	`}`