Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from Oct 31, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
073297c
Fix package.nls.json for npm
qcz Oct 29, 2017
ecb86a1
Fix language string key in npm/src/main.ts
qcz Oct 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions extensions/npm/package.nls.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"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",
"npm.parseError": "Npm task detection could not parse the {0}"
}
"npm.parseError": "Npm task detection: failed to parse the file {0}"
}
4 changes: 2 additions & 2 deletions extensions/npm/src/main.ts
View file
Open in desktop
Expand Up @@ -143,7 +143,7 @@ async function provideNpmScriptsForFolder(folder: vscode.WorkspaceFolder): Promi
// result.push(createTask('install', 'install', rootPath, folder, []));
return result;
} 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);
}
}
Expand All @@ -168,4 +168,4 @@ function createTask(script: string, cmd: string, rootPath: string, folder: vscod
};
let taskName = getTaskName(script);
return new vscode.Task(kind, folder, taskName, 'npm', new vscode.ShellExecution(getCommandLine(folder, cmd), { cwd: rootPath }), matcher);
}
}