Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-03-02 06:35:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

web - move help actions to browser

Browse Source
This commit is contained in:
Benjamin Pasero
2019-09-16 10:37:58 +02:00
parent 1d072c60af
commit 5e1179f0b8
27 changed files with 247 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/code/node/cli.ts
View File

@@ -8,7 +8,6 @@ import { buildHelpMessage, buildVersionMessage, addArg, createWaitMarkerFile, OP
import { parseCLIProcessArgv } from 'vs/platform/environment/node/argvHelper';
import { ParsedArgs } from 'vs/platform/environment/common/environment';
import product from 'vs/platform/product/node/product';
import pkg from 'vs/platform/product/node/package';
import * as paths from 'vs/base/common/path';
import * as os from 'os';
import * as fs from 'fs';
@@ -46,12 +45,12 @@ export async function main(argv: string[]): Promise<any> {
// Help
if (args.help) {
const executable = `${product.applicationName}${os.platform() === 'win32' ? '.exe' : ''}`;
console.log(buildHelpMessage(product.nameLong, executable, pkg.version, OPTIONS));
console.log(buildHelpMessage(product.nameLong, executable, product.version, OPTIONS));
}
// Version Info
else if (args.version) {
console.log(buildVersionMessage(pkg.version, product.commit));
console.log(buildVersionMessage(product.version, product.commit));
}
// Extensions Management

3
src/vs/code/node/cliProcessMain.ts
View File

@@ -5,7 +5,6 @@
import { localize } from 'vs/nls';
import product from 'vs/platform/product/node/product';
import pkg from 'vs/platform/product/node/package';
import * as path from 'vs/base/common/path';
import * as semver from 'semver-umd';
@@ -350,7 +349,7 @@ export async function main(argv: ParsedArgs): Promise<void> {
const config: ITelemetryServiceConfig = {
appender: combinedAppender(...appenders),
commonProperties: resolveCommonProperties(product.commit, pkg.version, stateService.getItem('telemetry.machineId'), product.msftInternalDomains, installSourcePath),
commonProperties: resolveCommonProperties(product.commit, product.version, stateService.getItem('telemetry.machineId'), product.msftInternalDomains, installSourcePath),
piiPaths: extensionsPath ? [appRoot, extensionsPath] : [appRoot]
};