Skip to content

Commit 5e1179f

Browse files
author
Benjamin Pasero
committed
web - move help actions to browser
1 parent 1d072c6 commit 5e1179f

27 files changed

Lines changed: 247 additions & 236 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.39.0",
4-
"distro": "bb5d0e1cef8b8321ebe0f7a208cf1d70720c1dec",
4+
"distro": "fd39b7b148a928c13bdf4648e5595416c698a1df",
55
"author": {
66
"name": "Microsoft Corporation"
77
},

‎src/vs/code/electron-browser/issue/issueReporterMain.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import * as collections from 'vs/base/common/collections';
1111
import * as browser from 'vs/base/browser/browser';
1212
import { escape } from 'vs/base/common/strings';
1313
import product from 'vs/platform/product/node/product';
14-
import pkg from 'vs/platform/product/node/package';
1514
import * as os from 'os';
1615
import { debounce } from 'vs/base/common/decorators';
1716
import * as platform from 'vs/base/common/platform';
@@ -85,7 +84,7 @@ export class IssueReporter extends Disposable {
8584
this.issueReporterModel = new IssueReporterModel({
8685
issueType: configuration.data.issueType || IssueType.Bug,
8786
versionInfo: {
88-
vscodeVersion: `${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`,
87+
vscodeVersion: `${product.nameShort} ${product.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`,
8988
os: `${os.type()} ${os.arch()} ${os.release()}${isSnap ? ' snap' : ''}`
9089
},
9190
extensionsDisabled: !!this.environmentService.disableExtensions,
@@ -311,7 +310,7 @@ export class IssueReporter extends Disposable {
311310
if (!this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) {
312311
const channel = getDelayedChannel(sharedProcess.then(c => c.getChannel('telemetryAppender')));
313312
const appender = combinedAppender(new TelemetryAppenderClient(channel), new LogAppender(logService));
314-
const commonProperties = resolveCommonProperties(product.commit || 'Commit unknown', pkg.version, configuration.machineId, product.msftInternalDomains, this.environmentService.installSourcePath);
313+
const commonProperties = resolveCommonProperties(product.commit || 'Commit unknown', product.version, configuration.machineId, product.msftInternalDomains, this.environmentService.installSourcePath);
315314
const piiPaths = this.environmentService.extensionsPath ? [this.environmentService.appRoot, this.environmentService.extensionsPath] : [this.environmentService.appRoot];
316315
const config: ITelemetryServiceConfig = { appender, commonProperties, piiPaths };
317316

‎src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import * as fs from 'fs';
77
import * as platform from 'vs/base/common/platform';
88
import product from 'vs/platform/product/node/product';
9-
import pkg from 'vs/platform/product/node/package';
109
import { serve, Server, connect } from 'vs/base/parts/ipc/node/ipc.net';
1110
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
1211
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
@@ -148,7 +147,7 @@ async function main(server: Server, initData: ISharedProcessInitData, configurat
148147
}
149148
const config: ITelemetryServiceConfig = {
150149
appender: combinedAppender(appInsightsAppender, new LogAppender(logService)),
151-
commonProperties: resolveCommonProperties(product.commit, pkg.version, configuration.machineId, product.msftInternalDomains, installSourcePath),
150+
commonProperties: resolveCommonProperties(product.commit, product.version, configuration.machineId, product.msftInternalDomains, installSourcePath),
152151
piiPaths: extensionsPath ? [appRoot, extensionsPath] : [appRoot]
153152
};
154153

‎src/vs/code/electron-main/app.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import { TelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry
3434
import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
3535
import { getDelayedChannel, StaticRouter } from 'vs/base/parts/ipc/common/ipc';
3636
import product from 'vs/platform/product/node/product';
37-
import pkg from 'vs/platform/product/node/package';
3837
import { ProxyAuthHandler } from 'vs/code/electron-main/auth';
3938
import { Disposable } from 'vs/base/common/lifecycle';
4039
import { IWindowsMainService, ICodeWindow } from 'vs/platform/windows/electron-main/windows';
@@ -474,7 +473,7 @@ export class CodeApplication extends Disposable {
474473
if (!this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) {
475474
const channel = getDelayedChannel(sharedProcessClient.then(client => client.getChannel('telemetryAppender')));
476475
const appender = combinedAppender(new TelemetryAppenderClient(channel), new LogAppender(this.logService));
477-
const commonProperties = resolveCommonProperties(product.commit, pkg.version, machineId, product.msftInternalDomains, this.environmentService.installSourcePath);
476+
const commonProperties = resolveCommonProperties(product.commit, product.version, machineId, product.msftInternalDomains, this.environmentService.installSourcePath);
478477
const piiPaths = this.environmentService.extensionsPath ? [this.environmentService.appRoot, this.environmentService.extensionsPath] : [this.environmentService.appRoot];
479478
const config: ITelemetryServiceConfig = { appender, commonProperties, piiPaths, trueMachineId };
480479

‎src/vs/code/electron-main/window.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import { IThemeMainService } from 'vs/platform/theme/electron-main/themeMainServ
2626
import { endsWith } from 'vs/base/common/strings';
2727
import { RunOnceScheduler } from 'vs/base/common/async';
2828
import { IFileService } from 'vs/platform/files/common/files';
29-
import pkg from 'vs/platform/product/node/package';
3029

3130
const RUN_TEXTMATE_IN_WORKER = false;
3231

@@ -310,7 +309,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
310309
private handleMarketplaceRequests(): void {
311310

312311
// Resolve marketplace headers
313-
this.marketplaceHeadersPromise = resolveMarketplaceHeaders(pkg.version, this.environmentService, this.fileService);
312+
this.marketplaceHeadersPromise = resolveMarketplaceHeaders(product.version, this.environmentService, this.fileService);
314313

315314
// Inject headers when requests are incoming
316315
const urls = ['https://marketplace.visualstudio.com/*', 'https://*.vsassets.io/*'];

‎src/vs/code/node/cli.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { buildHelpMessage, buildVersionMessage, addArg, createWaitMarkerFile, OP
88
import { parseCLIProcessArgv } from 'vs/platform/environment/node/argvHelper';
99
import { ParsedArgs } from 'vs/platform/environment/common/environment';
1010
import product from 'vs/platform/product/node/product';
11-
import pkg from 'vs/platform/product/node/package';
1211
import * as paths from 'vs/base/common/path';
1312
import * as os from 'os';
1413
import * as fs from 'fs';
@@ -46,12 +45,12 @@ export async function main(argv: string[]): Promise<any> {
4645
// Help
4746
if (args.help) {
4847
const executable = `${product.applicationName}${os.platform() === 'win32' ? '.exe' : ''}`;
49-
console.log(buildHelpMessage(product.nameLong, executable, pkg.version, OPTIONS));
48+
console.log(buildHelpMessage(product.nameLong, executable, product.version, OPTIONS));
5049
}
5150

5251
// Version Info
5352
else if (args.version) {
54-
console.log(buildVersionMessage(pkg.version, product.commit));
53+
console.log(buildVersionMessage(product.version, product.commit));
5554
}
5655

5756
// Extensions Management

‎src/vs/code/node/cliProcessMain.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import { localize } from 'vs/nls';
77
import product from 'vs/platform/product/node/product';
8-
import pkg from 'vs/platform/product/node/package';
98
import * as path from 'vs/base/common/path';
109
import * as semver from 'semver-umd';
1110

@@ -350,7 +349,7 @@ export async function main(argv: ParsedArgs): Promise<void> {
350349

351350
const config: ITelemetryServiceConfig = {
352351
appender: combinedAppender(...appenders),
353-
commonProperties: resolveCommonProperties(product.commit, pkg.version, stateService.getItem('telemetry.machineId'), product.msftInternalDomains, installSourcePath),
352+
commonProperties: resolveCommonProperties(product.commit, product.version, stateService.getItem('telemetry.machineId'), product.msftInternalDomains, installSourcePath),
354353
piiPaths: extensionsPath ? [appRoot, extensionsPath] : [appRoot]
355354
};
356355

‎src/vs/platform/diagnostics/node/diagnosticsService.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { join, basename } from 'vs/base/common/path';
1010
import { parse, ParseError } from 'vs/base/common/json';
1111
import { listProcesses } from 'vs/base/node/ps';
1212
import product from 'vs/platform/product/node/product';
13-
import pkg from 'vs/platform/product/node/package';
1413
import { repeat, pad } from 'vs/base/common/strings';
1514
import { isWindows } from 'vs/base/common/platform';
1615
import { URI } from 'vs/base/common/uri';
@@ -267,7 +266,7 @@ export class DiagnosticsService implements IDiagnosticsService {
267266
const GB = 1024 * MB;
268267

269268
const output: string[] = [];
270-
output.push(`Version: ${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`);
269+
output.push(`Version: ${product.nameShort} ${product.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`);
271270
output.push(`OS Version: ${osLib.type()} ${osLib.arch()} ${osLib.release()}`);
272271
const cpus = osLib.cpus();
273272
if (cpus && cpus.length > 0) {

‎src/vs/platform/environment/node/environmentService.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import * as os from 'os';
1010
import * as path from 'vs/base/common/path';
1111
import * as resources from 'vs/base/common/resources';
1212
import { memoize } from 'vs/base/common/decorators';
13-
import pkg from 'vs/platform/product/node/package';
1413
import product from 'vs/platform/product/node/product';
1514
import { toLocalISOString } from 'vs/base/common/date';
1615
import { isWindows, isLinux } from 'vs/base/common/platform';
@@ -26,16 +25,16 @@ function getNixIPCHandle(userDataPath: string, type: string): string {
2625

2726
if (xdgRuntimeDir && !vscodePortable) {
2827
const scope = crypto.createHash('md5').update(userDataPath).digest('hex').substr(0, 8);
29-
return path.join(xdgRuntimeDir, `vscode-${scope}-${pkg.version}-${type}.sock`);
28+
return path.join(xdgRuntimeDir, `vscode-${scope}-${product.version}-${type}.sock`);
3029
}
3130

32-
return path.join(userDataPath, `${pkg.version}-${type}.sock`);
31+
return path.join(userDataPath, `${product.version}-${type}.sock`);
3332
}
3433

3534
function getWin32IPCHandle(userDataPath: string, type: string): string {
3635
const scope = crypto.createHash('md5').update(userDataPath).digest('hex');
3736

38-
return `\\\\.\\pipe\\${scope}-${pkg.version}-${type}-sock`;
37+
return `\\\\.\\pipe\\${scope}-${product.version}-${type}-sock`;
3938
}
4039

4140
function getIPCHandle(userDataPath: string, type: string): string {

‎src/vs/platform/extensionManagement/node/extensionManagementService.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { Limiter, createCancelablePromise, CancelablePromise, Queue } from 'vs/b
2828
import { Event, Emitter } from 'vs/base/common/event';
2929
import * as semver from 'semver-umd';
3030
import { URI } from 'vs/base/common/uri';
31-
import pkg from 'vs/platform/product/node/package';
31+
import product from 'vs/platform/product/node/product';
3232
import { isMacintosh, isWindows } from 'vs/base/common/platform';
3333
import { ILogService } from 'vs/platform/log/common/log';
3434
import { ExtensionsManifestCache } from 'vs/platform/extensionManagement/node/extensionsManifestCache';
@@ -203,8 +203,8 @@ export class ExtensionManagementService extends Disposable implements IExtension
203203
.then(manifest => {
204204
const identifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name) };
205205
let operation: InstallOperation = InstallOperation.Install;
206-
if (manifest.engines && manifest.engines.vscode && !isEngineValid(manifest.engines.vscode, pkg.version)) {
207-
return Promise.reject(new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with VS Code '{1}'.", identifier.id, pkg.version)));
206+
if (manifest.engines && manifest.engines.vscode && !isEngineValid(manifest.engines.vscode, product.version)) {
207+
return Promise.reject(new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with VS Code '{1}'.", identifier.id, product.version)));
208208
}
209209
const identifierWithVersion = new ExtensionIdentifierWithVersion(identifier, manifest.version);
210210
return this.getInstalled(ExtensionType.User)
@@ -356,7 +356,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
356356
const compatibleExtension = await this.galleryService.getCompatibleExtension(extension);
357357

358358
if (!compatibleExtension) {
359-
return Promise.reject(new ExtensionManagementError(nls.localize('notFoundCompatibleDependency', "Unable to install '{0}' extension because it is not compatible with the current version of VS Code (version {1}).", extension.identifier.id, pkg.version), INSTALL_ERROR_INCOMPATIBLE));
359+
return Promise.reject(new ExtensionManagementError(nls.localize('notFoundCompatibleDependency', "Unable to install '{0}' extension because it is not compatible with the current version of VS Code (version {1}).", extension.identifier.id, product.version), INSTALL_ERROR_INCOMPATIBLE));
360360
}
361361

362362
return compatibleExtension;

0 commit comments

Comments
 (0)