Skip to content

Commit 262bb4c

Browse files
author
Benjamin Pasero
committed
debt - make diagnostics service only accessible from node
1 parent 03a43bb commit 262bb4c

15 files changed

Lines changed: 29 additions & 29 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
3939
import { normalizeGitHubUrl } from 'vs/code/electron-browser/issue/issueReporterUtil';
4040
import { Button } from 'vs/base/browser/ui/button/button';
4141
import { withUndefinedAsNull } from 'vs/base/common/types';
42-
import { SystemInfo, isRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnosticsService';
42+
import { SystemInfo, isRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
4343
import { SpdLogService } from 'vs/platform/log/node/spdlogService';
4444

4545
const MAX_URL_LENGTH = 2045;

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

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

66
import { assign } from 'vs/base/common/objects';
77
import { IssueType, ISettingSearchResult, IssueReporterExtensionData } from 'vs/platform/issue/node/issue';
8-
import { SystemInfo, isRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnosticsService';
8+
import { SystemInfo, isRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
99

1010
export interface IssueReporterData {
1111
issueType: IssueType;

‎src/vs/code/electron-browser/processExplorer/processExplorerMain.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { popup } from 'vs/base/parts/contextmenu/electron-browser/contextmenu';
1717
import { ProcessItem } from 'vs/base/common/processes';
1818
import { addDisposableListener } from 'vs/base/browser/dom';
1919
import { DisposableStore } from 'vs/base/common/lifecycle';
20-
import { isRemoteDiagnosticError, IRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnosticsService';
20+
import { isRemoteDiagnosticError, IRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
2121

2222

2323
let mapPidToWindowTitle = new Map<number, string>();

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ import { LogsDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/
4848
import { IMainProcessService } from 'vs/platform/ipc/electron-browser/mainProcessService';
4949
import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
5050
import { SpdLogService } from 'vs/platform/log/node/spdlogService';
51-
import { DiagnosticsService } from 'vs/platform/diagnostics/node/diagnosticsService';
52-
import { IDiagnosticsService } from 'vs/platform/diagnostics/common/diagnosticsService';
51+
import { DiagnosticsService, IDiagnosticsService } from 'vs/platform/diagnostics/node/diagnosticsService';
5352
import { DiagnosticsChannel } from 'vs/platform/diagnostics/node/diagnosticsIpc';
5453
import { FileService } from 'vs/platform/files/common/fileService';
5554
import { IFileService } from 'vs/platform/files/common/files';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ import { nodeSocketFactory } from 'vs/platform/remote/node/nodeSocketFactory';
8181
import { VSBuffer } from 'vs/base/common/buffer';
8282
import { statSync } from 'fs';
8383
import { ISignService } from 'vs/platform/sign/common/sign';
84-
import { IDiagnosticsService } from 'vs/platform/diagnostics/common/diagnosticsService';
8584
import { DiagnosticsService } from 'vs/platform/diagnostics/node/diagnosticsIpc';
85+
import { IDiagnosticsService } from 'vs/platform/diagnostics/node/diagnosticsService';
8686
import { FileService } from 'vs/platform/files/common/fileService';
8787
import { IFileService } from 'vs/platform/files/common/files';
8888
import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemProvider';

src/vs/platform/diagnostics/common/diagnosticsService.ts renamed to src/vs/platform/diagnostics/common/diagnostics.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
import { UriComponents } from 'vs/base/common/uri';
77
import { ProcessItem } from 'vs/base/common/processes';
8-
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
9-
import { IMainProcessInfo } from 'vs/platform/launch/common/launchService';
108
import { IWorkspace } from 'vs/platform/workspace/common/workspace';
119
import { IStringDictionary } from 'vs/base/common/collections';
1210

@@ -67,18 +65,6 @@ export interface IWorkspaceInformation extends IWorkspace {
6765
telemetryId: string | undefined;
6866
}
6967

70-
export const ID = 'diagnosticsService';
71-
export const IDiagnosticsService = createDecorator<IDiagnosticsService>(ID);
72-
73-
export interface IDiagnosticsService {
74-
_serviceBrand: any;
75-
76-
getPerformanceInfo(mainProcessInfo: IMainProcessInfo, remoteInfo: (IRemoteDiagnosticInfo | IRemoteDiagnosticError)[]): Promise<PerformanceInfo>;
77-
getSystemInfo(mainProcessInfo: IMainProcessInfo, remoteInfo: (IRemoteDiagnosticInfo | IRemoteDiagnosticError)[]): Promise<SystemInfo>;
78-
getDiagnostics(mainProcessInfo: IMainProcessInfo, remoteInfo: (IRemoteDiagnosticInfo | IRemoteDiagnosticError)[]): Promise<string>;
79-
reportWorkspaceStats(workspace: IWorkspaceInformation): Promise<void>;
80-
}
81-
8268
export function isRemoteDiagnosticError(x: any): x is IRemoteDiagnosticError {
8369
return !!x.hostName && !!x.errorMessage;
8470
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { IServerChannel, IChannel } from 'vs/base/parts/ipc/common/ipc';
7-
import { IDiagnosticsService, IRemoteDiagnosticInfo, IRemoteDiagnosticError, SystemInfo, PerformanceInfo } from 'vs/platform/diagnostics/common/diagnosticsService';
7+
import { IRemoteDiagnosticInfo, IRemoteDiagnosticError, SystemInfo, PerformanceInfo } from 'vs/platform/diagnostics/common/diagnostics';
8+
import { IDiagnosticsService } from './diagnosticsService';
89
import { Event } from 'vs/base/common/event';
910
import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
1011
import { IMainProcessInfo } from 'vs/platform/launch/common/launchService';

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55
import * as osLib from 'os';
66
import { virtualMachineHint } from 'vs/base/node/id';
7-
import { IMachineInfo, WorkspaceStats, WorkspaceStatItem, IDiagnosticsService, PerformanceInfo, SystemInfo, IRemoteDiagnosticInfo, IRemoteDiagnosticError, isRemoteDiagnosticError, IWorkspaceInformation } from 'vs/platform/diagnostics/common/diagnosticsService';
7+
import { IMachineInfo, WorkspaceStats, WorkspaceStatItem, PerformanceInfo, SystemInfo, IRemoteDiagnosticInfo, IRemoteDiagnosticError, isRemoteDiagnosticError, IWorkspaceInformation } from 'vs/platform/diagnostics/common/diagnostics';
88
import { readdir, stat, exists, readFile } from 'fs';
99
import { join, basename } from 'vs/base/common/path';
1010
import { parse, ParseError } from 'vs/base/common/json';
@@ -17,6 +17,19 @@ import { URI } from 'vs/base/common/uri';
1717
import { ProcessItem } from 'vs/base/common/processes';
1818
import { IMainProcessInfo } from 'vs/platform/launch/common/launchService';
1919
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
20+
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
21+
22+
export const ID = 'diagnosticsService';
23+
export const IDiagnosticsService = createDecorator<IDiagnosticsService>(ID);
24+
25+
export interface IDiagnosticsService {
26+
_serviceBrand: any;
27+
28+
getPerformanceInfo(mainProcessInfo: IMainProcessInfo, remoteInfo: (IRemoteDiagnosticInfo | IRemoteDiagnosticError)[]): Promise<PerformanceInfo>;
29+
getSystemInfo(mainProcessInfo: IMainProcessInfo, remoteInfo: (IRemoteDiagnosticInfo | IRemoteDiagnosticError)[]): Promise<SystemInfo>;
30+
getDiagnostics(mainProcessInfo: IMainProcessInfo, remoteInfo: (IRemoteDiagnosticInfo | IRemoteDiagnosticError)[]): Promise<string>;
31+
reportWorkspaceStats(workspace: IWorkspaceInformation): Promise<void>;
32+
}
2033

2134
export interface VersionInfo {
2235
vscodeVersion: string;

‎src/vs/platform/issue/electron-main/issueService.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import { parseArgs } from 'vs/platform/environment/node/argv';
99
import { IIssueService, IssueReporterData, IssueReporterFeatures, ProcessExplorerData } from 'vs/platform/issue/node/issue';
1010
import { BrowserWindow, ipcMain, screen, Event, dialog } from 'electron';
1111
import { ILaunchService } from 'vs/platform/launch/electron-main/launchService';
12-
import { PerformanceInfo, IDiagnosticsService, isRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnosticsService';
12+
import { PerformanceInfo, isRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
13+
import { IDiagnosticsService } from 'vs/platform/diagnostics/node/diagnosticsService';
1314
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
1415
import { isMacintosh, IProcessEnvironment } from 'vs/base/common/platform';
1516
import { ILogService } from 'vs/platform/log/common/log';

‎src/vs/platform/launch/electron-main/launchService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { BrowserWindow, ipcMain, Event as IpcEvent, app } from 'electron';
1919
import { Event } from 'vs/base/common/event';
2020
import { hasArgs } from 'vs/platform/environment/node/argv';
2121
import { coalesce } from 'vs/base/common/arrays';
22-
import { IDiagnosticInfoOptions, IDiagnosticInfo, IRemoteDiagnosticInfo, IRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnosticsService';
22+
import { IDiagnosticInfoOptions, IDiagnosticInfo, IRemoteDiagnosticInfo, IRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
2323
import { IMainProcessInfo, IWindowInfo } from 'vs/platform/launch/common/launchService';
2424

2525
export const ID = 'launchService';

0 commit comments

Comments
 (0)