Skip to content

Commit 77e25ac

Browse files
committed
Fixes microsoft#3306: If we generate a non empty tasks.json it should not trigger intelisense
1 parent 3dfbf90 commit 77e25ac

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ class ConfigureTaskRunnerAction extends Action {
174174
public run(event?:any): Promise {
175175
let sideBySide = !!(event && (event.ctrlKey || event.metaKey));
176176
let autoDetectFailed = false;
177+
let useTaskSampleConfig = false;
177178
let fileCreated = false;
178179
return this.fileService.resolveFile(this.contextService.toResource('.vscode/tasks.json')).then((success) => {
179180
return success;
@@ -195,6 +196,7 @@ class ConfigureTaskRunnerAction extends Action {
195196
// TODO@Dirk: Converting double time here to get a wrong uri that is compatible with the rest of the system
196197
let configSampleUri = URI.parse(require.toUrl('vs/workbench/parts/tasks/common/taskSampleConfig.json'));
197198
contentPromise = this.fileService.resolveContent(configSampleUri, { encoding: 'utf8' /* make sure to keep sample file encoding as we stored it! */}).then(content => {
199+
useTaskSampleConfig = true;
198200
return content.value;
199201
}, (err:any) => {
200202
let config: FileConfig.ExternalTaskRunnerConfiguration = {
@@ -221,7 +223,7 @@ class ConfigureTaskRunnerAction extends Action {
221223
forceOpen: true
222224
}
223225
}, sideBySide).then((editor) => {
224-
if (fileCreated) {
226+
if (useTaskSampleConfig && fileCreated) {
225227
let codeEditor: ICodeEditor = editor.getControl() as ICodeEditor;
226228
let position = { lineNumber: 5, column: 2 };
227229
codeEditor.revealPosition(position);

0 commit comments

Comments
 (0)