daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix different error message in source and package.nls for npm package (#37096) 

* Fix package.nls.json for npm

Error message was different in main.ts.

* Fix language string key in npm/src/main.ts
pull/36099/merge
Dániel Tar 2017-10-31 14:27:24 +01:00 committed by Erich Gamma
parent cabf4b2997
commit a05e3d996a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/npm/package.nls.json
View File

@ -1,5 +1,5 @@
{ {
"config.npm.autoDetect": "Controls whether auto detection of npm scripts is on or off. Default is on.", "config.npm.autoDetect": "Controls whether auto detection of npm scripts is on or off. Default is on.",
"config.npm.runSilent": "Run npm commands with the `--silent` option", "config.npm.runSilent": "Run npm commands with the `--silent` option",
"npm.parseError": "Npm task detection could not parse the {0}" "npm.parseError": "Npm task detection: failed to parse the file {0}"
} }

4
extensions/npm/src/main.ts
View File

@ -143,7 +143,7 @@ async function provideNpmScriptsForFolder(folder: vscode.WorkspaceFolder): Promi
// result.push(createTask('install', 'install', rootPath, folder, [])); // result.push(createTask('install', 'install', rootPath, folder, []));
return result; return result;
} catch (e) { } catch (e) {
let localizedParseError = localize('npm.parseerror', 'Npm task detection: failed to parse the file {0}', packageJson); let localizedParseError = localize('npm.parseError', 'Npm task detection: failed to parse the file {0}', packageJson);
throw new Error(localizedParseError); throw new Error(localizedParseError);
} }
} }
@ -168,4 +168,4 @@ function createTask(script: string, cmd: string, rootPath: string, folder: vscod
}; };
let taskName = getTaskName(script); let taskName = getTaskName(script);
return new vscode.Task(kind, folder, taskName, 'npm', new vscode.ShellExecution(getCommandLine(folder, cmd), { cwd: rootPath }), matcher); return new vscode.Task(kind, folder, taskName, 'npm', new vscode.ShellExecution(getCommandLine(folder, cmd), { cwd: rootPath }), matcher);
} }