未验证 提交 9d125dd6 编写于 作者: M Matt Bierner 提交者: GitHub

Re-enable building VS Code with TS 3.7 (#82289)

* Re-enable building VS Code with TS 3.7

Reverts 5b0cdadc

Blocked from check in due to https://github.com/microsoft/TypeScript/issues/33936

* update d.ts for ts 3.7
上级 9c0eaf76
......@@ -516,7 +516,7 @@ class DeclarationResolver {
'file.ts': fileContents
};
const service = ts.createLanguageService(new TypeScriptLanguageServiceHost({}, fileMap, {}));
const text = service.getEmitOutput('file.ts', true).outputFiles[0].text;
const text = service.getEmitOutput('file.ts', true, true).outputFiles[0].text;
return new CacheEntry(ts.createSourceFile(fileName, text, ts.ScriptTarget.ES5), mtime);
}
}
......
......@@ -617,7 +617,7 @@ export class DeclarationResolver {
'file.ts': fileContents
};
const service = ts.createLanguageService(new TypeScriptLanguageServiceHost({}, fileMap, {}));
const text = service.getEmitOutput('file.ts', true).outputFiles[0].text;
const text = service.getEmitOutput('file.ts', true, true).outputFiles[0].text;
return new CacheEntry(
ts.createSourceFile(fileName, text, ts.ScriptTarget.ES5),
mtime
......
......@@ -42,7 +42,7 @@
"request": "^2.85.0",
"terser": "4.3.8",
"tslint": "^5.9.1",
"typescript": "3.6.2",
"typescript": "3.7.0-dev.20191017",
"vsce": "1.48.0",
"vscode-telemetry-extractor": "^1.5.4",
"xml2js": "^0.4.17"
......
......@@ -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-dev.20191017:
version "3.7.0-dev.20191017"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.0-dev.20191017.tgz#e61440dd445edea6d7b9a699e7c5d5fbcd1906f2"
integrity sha512-Yi0lCPEN0cn9Gp8TEEkPpgKNR5SWAmx9Hmzzz+oEuivw6amURqRGynaLyFZkMA9iMsvYG5LLqhdlFO3uu5ZT/w==
typescript@^3.0.1:
version "3.5.3"
......
......@@ -42,7 +42,7 @@ declare namespace monaco {
export class CancellationTokenSource {
constructor(parent?: CancellationToken);
readonly token: CancellationToken;
get token(): CancellationToken;
cancel(): void;
dispose(cancel?: boolean): void;
}
......@@ -118,7 +118,7 @@ declare namespace monaco {
* namely the server name, would be missing. Therefore `Uri#fsPath` exists - it's sugar to ease working
* with URIs that represent files on disk (`file` scheme).
*/
readonly fsPath: string;
get fsPath(): string;
with(change: {
scheme?: string;
authority?: string | null;
......
......@@ -321,9 +321,7 @@ export class ElectronWebviewBasedWebview extends BaseWebview<WebviewTag> impleme
}
protected postMessage(channel: string, data?: any): void {
if (this.element) {
this.element.send(channel, data);
}
this.element?.send(channel, data);
}
public focus(): void {
......@@ -408,57 +406,39 @@ export class ElectronWebviewBasedWebview extends BaseWebview<WebviewTag> impleme
}
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 selectAll() {
if (this.element) {
this.element.selectAll();
}
this.element?.selectAll();
}
public copy() {
if (this.element) {
this.element.copy();
}
this.element?.copy();
}
public paste() {
if (this.element) {
this.element.paste();
}
this.element?.paste();
}
public cut() {
if (this.element) {
this.element.cut();
}
this.element?.cut();
}
public undo() {
if (this.element) {
this.element.undo();
}
this.element?.undo();
}
public redo() {
if (this.element) {
this.element.redo();
}
this.element?.redo();
}
protected on<T = unknown>(channel: WebviewMessageChannels | string, handler: (data: T) => void): IDisposable {
......
......@@ -8510,10 +8510,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-dev.20191017:
version "3.7.0-dev.20191017"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.0-dev.20191017.tgz#e61440dd445edea6d7b9a699e7c5d5fbcd1906f2"
integrity sha512-Yi0lCPEN0cn9Gp8TEEkPpgKNR5SWAmx9Hmzzz+oEuivw6amURqRGynaLyFZkMA9iMsvYG5LLqhdlFO3uu5ZT/w==
typescript@^2.6.2:
version "2.6.2"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册