Revert "Build VS code using TS 3.7-beta"

mjbvz · mjbvz · commit 5b0cdadc871b · 2019-10-10T14:39:59.000-07:00
This reverts commit 11f24f6.
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.7.0-beta",
+    "typescript": "3.6.2",
     "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.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.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.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.7.0-beta",
+    "typescript": "3.6",
     "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,6 +568,7 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview,
 
 	public layout(): void {
 		// noop
+
 	}
 
 	private readonly _hasFindResult = this._register(new Emitter<boolean>());
@@ -629,42 +630,60 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview,
 	}
 
 	public showFind() {
-		this._webviewFindWidget?.reveal();
+		if (this._webviewFindWidget) {
+			this._webviewFindWidget.reveal();
+		}
 	}
 
 	public hideFind() {
-		this._webviewFindWidget?.hide();
+		if (this._webviewFindWidget) {
+			this._webviewFindWidget.hide();
+		}
 	}
 
 	public runFindAction(previous: boolean) {
-		this._webviewFindWidget?.find(previous);
+		if (this._webviewFindWidget) {
+			this._webviewFindWidget.find(previous);
+		}
 	}
 
 	public reload() {
 		this.doUpdateContent();
 	}
 
 	public selectAll() {
-		this._webview?.selectAll();
+		if (this._webview) {
+			this._webview.selectAll();
+		}
 	}
 
 	public copy() {
-		this._webview?.copy();
+		if (this._webview) {
+			this._webview.copy();
+		}
 	}
 
 	public paste() {
-		this._webview?.paste();
+		if (this._webview) {
+			this._webview.paste();
+		}
 	}
 
 	public cut() {
-		this._webview?.cut();
+		if (this._webview) {
+			this._webview.cut();
+		}
 	}
 
 	public undo() {
-		this._webview?.undo();
+		if (this._webview) {
+			this._webview.undo();
+		}
 	}
 
 	public redo() {
-		this._webview?.redo();
+		if (this._webview) {
+			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.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.6:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.2.tgz#105b0f1934119dde543ac8eb71af3a91009efe54"
+  integrity sha512-lmQ4L+J6mnu3xweP8+rOrUwzmN+MRAj7TgtJtDaXE5PMyX2kCrklhg3rvOsOIfNeAWMQWO2F1GPc1kMD2vLAfw==
 
 typescript@^2.6.2:
   version "2.6.2"

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