提交 78676ce5 编写于 作者: M Matt Bierner

Ensure the default js/tsconfig has content when first created. Fixes #21209

上级 f856147a
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* ------------------------------------------------------------------------------------------ */ * ------------------------------------------------------------------------------------------ */
'use strict'; 'use strict';
import { env, languages, commands, workspace, window, ExtensionContext, Memento, IndentAction, Diagnostic, DiagnosticCollection, Range, Disposable, Uri, MessageItem, TextEditor, DiagnosticSeverity, TextDocument } from 'vscode'; import { env, languages, commands, workspace, window, ExtensionContext, Memento, IndentAction, Diagnostic, DiagnosticCollection, Range, Disposable, Uri, MessageItem, TextEditor, DiagnosticSeverity, TextDocument, SnippetString } from 'vscode';
// This must be the first statement otherwise modules might got loaded with // This must be the first statement otherwise modules might got loaded with
// the wrong locale. // the wrong locale.
...@@ -531,10 +531,15 @@ class TypeScriptServiceClientHost implements ITypescriptServiceClientHost { ...@@ -531,10 +531,15 @@ class TypeScriptServiceClientHost implements ITypescriptServiceClientHost {
switch (selected && selected.id) { switch (selected && selected.id) {
case ProjectConfigAction.CreateConfig: case ProjectConfigAction.CreateConfig:
const configFile = Uri.file(path.join(rootPath, isTypeScriptProject ? 'tsconfig.json' : 'jsconfig.json')); const configFile = Uri.file(path.join(rootPath, isTypeScriptProject ? 'tsconfig.json' : 'jsconfig.json'));
const col = window.activeTextEditor ? window.activeTextEditor.viewColumn : undefined;
return workspace.openTextDocument(configFile) return workspace.openTextDocument(configFile)
.then(undefined, _ => workspace.openTextDocument(configFile.with({ scheme: 'untitled' }))) .then(doc => {
.then(doc => return window.showTextDocument(doc, col);
window.showTextDocument(doc, window.activeTextEditor ? window.activeTextEditor.viewColumn : undefined)); }, _ => {
return workspace.openTextDocument(configFile.with({ scheme: 'untitled' }))
.then(doc => window.showTextDocument(doc, col))
.then(editor => editor.insertSnippet(new SnippetString('{\n\t$0\n}')));
});
case ProjectConfigAction.LearnMore: case ProjectConfigAction.LearnMore:
if (isTypeScriptProject) { if (isTypeScriptProject) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册