Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
262bb4c4
V
Vscode
项目概览
徽霖
/
Vscode
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
Vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
262bb4c4
编写于
8月 15, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - make diagnostics service only accessible from node
上级
03a43bba
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
29 addition
and
29 deletion
+29
-29
src/vs/code/electron-browser/issue/issueReporterMain.ts
src/vs/code/electron-browser/issue/issueReporterMain.ts
+1
-1
src/vs/code/electron-browser/issue/issueReporterModel.ts
src/vs/code/electron-browser/issue/issueReporterModel.ts
+1
-1
src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
...e/electron-browser/processExplorer/processExplorerMain.ts
+1
-1
src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
.../code/electron-browser/sharedProcess/sharedProcessMain.ts
+1
-2
src/vs/code/electron-main/app.ts
src/vs/code/electron-main/app.ts
+1
-1
src/vs/platform/diagnostics/common/diagnostics.ts
src/vs/platform/diagnostics/common/diagnostics.ts
+0
-14
src/vs/platform/diagnostics/node/diagnosticsIpc.ts
src/vs/platform/diagnostics/node/diagnosticsIpc.ts
+2
-1
src/vs/platform/diagnostics/node/diagnosticsService.ts
src/vs/platform/diagnostics/node/diagnosticsService.ts
+14
-1
src/vs/platform/issue/electron-main/issueService.ts
src/vs/platform/issue/electron-main/issueService.ts
+2
-1
src/vs/platform/launch/electron-main/launchService.ts
src/vs/platform/launch/electron-main/launchService.ts
+1
-1
src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts
...ch/contrib/remote/electron-browser/remote.contribution.ts
+1
-1
src/vs/workbench/contrib/stats/electron-browser/workspaceStats.ts
...orkbench/contrib/stats/electron-browser/workspaceStats.ts
+1
-1
src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
...ench/services/remote/common/abstractRemoteAgentService.ts
+1
-1
src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
...h/services/remote/common/remoteAgentEnvironmentChannel.ts
+1
-1
src/vs/workbench/services/remote/common/remoteAgentService.ts
...vs/workbench/services/remote/common/remoteAgentService.ts
+1
-1
未找到文件。
src/vs/code/electron-browser/issue/issueReporterMain.ts
浏览文件 @
262bb4c4
...
...
@@ -39,7 +39,7 @@ import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
import
{
normalizeGitHubUrl
}
from
'
vs/code/electron-browser/issue/issueReporterUtil
'
;
import
{
Button
}
from
'
vs/base/browser/ui/button/button
'
;
import
{
withUndefinedAsNull
}
from
'
vs/base/common/types
'
;
import
{
SystemInfo
,
isRemoteDiagnosticError
}
from
'
vs/platform/diagnostics/common/diagnostics
Service
'
;
import
{
SystemInfo
,
isRemoteDiagnosticError
}
from
'
vs/platform/diagnostics/common/diagnostics
'
;
import
{
SpdLogService
}
from
'
vs/platform/log/node/spdlogService
'
;
const
MAX_URL_LENGTH
=
2045
;
...
...
src/vs/code/electron-browser/issue/issueReporterModel.ts
浏览文件 @
262bb4c4
...
...
@@ -5,7 +5,7 @@
import
{
assign
}
from
'
vs/base/common/objects
'
;
import
{
IssueType
,
ISettingSearchResult
,
IssueReporterExtensionData
}
from
'
vs/platform/issue/node/issue
'
;
import
{
SystemInfo
,
isRemoteDiagnosticError
}
from
'
vs/platform/diagnostics/common/diagnostics
Service
'
;
import
{
SystemInfo
,
isRemoteDiagnosticError
}
from
'
vs/platform/diagnostics/common/diagnostics
'
;
export
interface
IssueReporterData
{
issueType
:
IssueType
;
...
...
src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
浏览文件 @
262bb4c4
...
...
@@ -17,7 +17,7 @@ import { popup } from 'vs/base/parts/contextmenu/electron-browser/contextmenu';
import
{
ProcessItem
}
from
'
vs/base/common/processes
'
;
import
{
addDisposableListener
}
from
'
vs/base/browser/dom
'
;
import
{
DisposableStore
}
from
'
vs/base/common/lifecycle
'
;
import
{
isRemoteDiagnosticError
,
IRemoteDiagnosticError
}
from
'
vs/platform/diagnostics/common/diagnostics
Service
'
;
import
{
isRemoteDiagnosticError
,
IRemoteDiagnosticError
}
from
'
vs/platform/diagnostics/common/diagnostics
'
;
let
mapPidToWindowTitle
=
new
Map
<
number
,
string
>
();
...
...
src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
浏览文件 @
262bb4c4
...
...
@@ -48,8 +48,7 @@ import { LogsDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/
import
{
IMainProcessService
}
from
'
vs/platform/ipc/electron-browser/mainProcessService
'
;
import
{
ServiceIdentifier
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
SpdLogService
}
from
'
vs/platform/log/node/spdlogService
'
;
import
{
DiagnosticsService
}
from
'
vs/platform/diagnostics/node/diagnosticsService
'
;
import
{
IDiagnosticsService
}
from
'
vs/platform/diagnostics/common/diagnosticsService
'
;
import
{
DiagnosticsService
,
IDiagnosticsService
}
from
'
vs/platform/diagnostics/node/diagnosticsService
'
;
import
{
DiagnosticsChannel
}
from
'
vs/platform/diagnostics/node/diagnosticsIpc
'
;
import
{
FileService
}
from
'
vs/platform/files/common/fileService
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
...
...
src/vs/code/electron-main/app.ts
浏览文件 @
262bb4c4
...
...
@@ -81,8 +81,8 @@ import { nodeSocketFactory } from 'vs/platform/remote/node/nodeSocketFactory';
import
{
VSBuffer
}
from
'
vs/base/common/buffer
'
;
import
{
statSync
}
from
'
fs
'
;
import
{
ISignService
}
from
'
vs/platform/sign/common/sign
'
;
import
{
IDiagnosticsService
}
from
'
vs/platform/diagnostics/common/diagnosticsService
'
;
import
{
DiagnosticsService
}
from
'
vs/platform/diagnostics/node/diagnosticsIpc
'
;
import
{
IDiagnosticsService
}
from
'
vs/platform/diagnostics/node/diagnosticsService
'
;
import
{
FileService
}
from
'
vs/platform/files/common/fileService
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
import
{
DiskFileSystemProvider
}
from
'
vs/platform/files/node/diskFileSystemProvider
'
;
...
...
src/vs/platform/diagnostics/common/diagnostics
Service
.ts
→
src/vs/platform/diagnostics/common/diagnostics.ts
浏览文件 @
262bb4c4
...
...
@@ -5,8 +5,6 @@
import
{
UriComponents
}
from
'
vs/base/common/uri
'
;
import
{
ProcessItem
}
from
'
vs/base/common/processes
'
;
import
{
createDecorator
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IMainProcessInfo
}
from
'
vs/platform/launch/common/launchService
'
;
import
{
IWorkspace
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IStringDictionary
}
from
'
vs/base/common/collections
'
;
...
...
@@ -67,18 +65,6 @@ export interface IWorkspaceInformation extends IWorkspace {
telemetryId
:
string
|
undefined
;
}
export
const
ID
=
'
diagnosticsService
'
;
export
const
IDiagnosticsService
=
createDecorator
<
IDiagnosticsService
>
(
ID
);
export
interface
IDiagnosticsService
{
_serviceBrand
:
any
;
getPerformanceInfo
(
mainProcessInfo
:
IMainProcessInfo
,
remoteInfo
:
(
IRemoteDiagnosticInfo
|
IRemoteDiagnosticError
)[]):
Promise
<
PerformanceInfo
>
;
getSystemInfo
(
mainProcessInfo
:
IMainProcessInfo
,
remoteInfo
:
(
IRemoteDiagnosticInfo
|
IRemoteDiagnosticError
)[]):
Promise
<
SystemInfo
>
;
getDiagnostics
(
mainProcessInfo
:
IMainProcessInfo
,
remoteInfo
:
(
IRemoteDiagnosticInfo
|
IRemoteDiagnosticError
)[]):
Promise
<
string
>
;
reportWorkspaceStats
(
workspace
:
IWorkspaceInformation
):
Promise
<
void
>
;
}
export
function
isRemoteDiagnosticError
(
x
:
any
):
x
is
IRemoteDiagnosticError
{
return
!!
x
.
hostName
&&
!!
x
.
errorMessage
;
}
src/vs/platform/diagnostics/node/diagnosticsIpc.ts
浏览文件 @
262bb4c4
...
...
@@ -4,7 +4,8 @@
*--------------------------------------------------------------------------------------------*/
import
{
IServerChannel
,
IChannel
}
from
'
vs/base/parts/ipc/common/ipc
'
;
import
{
IDiagnosticsService
,
IRemoteDiagnosticInfo
,
IRemoteDiagnosticError
,
SystemInfo
,
PerformanceInfo
}
from
'
vs/platform/diagnostics/common/diagnosticsService
'
;
import
{
IRemoteDiagnosticInfo
,
IRemoteDiagnosticError
,
SystemInfo
,
PerformanceInfo
}
from
'
vs/platform/diagnostics/common/diagnostics
'
;
import
{
IDiagnosticsService
}
from
'
./diagnosticsService
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
ServiceIdentifier
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IMainProcessInfo
}
from
'
vs/platform/launch/common/launchService
'
;
...
...
src/vs/platform/diagnostics/node/diagnosticsService.ts
浏览文件 @
262bb4c4
...
...
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import
*
as
osLib
from
'
os
'
;
import
{
virtualMachineHint
}
from
'
vs/base/node/id
'
;
import
{
IMachineInfo
,
WorkspaceStats
,
WorkspaceStatItem
,
IDiagnosticsService
,
PerformanceInfo
,
SystemInfo
,
IRemoteDiagnosticInfo
,
IRemoteDiagnosticError
,
isRemoteDiagnosticError
,
IWorkspaceInformation
}
from
'
vs/platform/diagnostics/common/diagnosticsService
'
;
import
{
IMachineInfo
,
WorkspaceStats
,
WorkspaceStatItem
,
PerformanceInfo
,
SystemInfo
,
IRemoteDiagnosticInfo
,
IRemoteDiagnosticError
,
isRemoteDiagnosticError
,
IWorkspaceInformation
}
from
'
vs/platform/diagnostics/common/diagnostics
'
;
import
{
readdir
,
stat
,
exists
,
readFile
}
from
'
fs
'
;
import
{
join
,
basename
}
from
'
vs/base/common/path
'
;
import
{
parse
,
ParseError
}
from
'
vs/base/common/json
'
;
...
...
@@ -17,6 +17,19 @@ import { URI } from 'vs/base/common/uri';
import
{
ProcessItem
}
from
'
vs/base/common/processes
'
;
import
{
IMainProcessInfo
}
from
'
vs/platform/launch/common/launchService
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
createDecorator
}
from
'
vs/platform/instantiation/common/instantiation
'
;
export
const
ID
=
'
diagnosticsService
'
;
export
const
IDiagnosticsService
=
createDecorator
<
IDiagnosticsService
>
(
ID
);
export
interface
IDiagnosticsService
{
_serviceBrand
:
any
;
getPerformanceInfo
(
mainProcessInfo
:
IMainProcessInfo
,
remoteInfo
:
(
IRemoteDiagnosticInfo
|
IRemoteDiagnosticError
)[]):
Promise
<
PerformanceInfo
>
;
getSystemInfo
(
mainProcessInfo
:
IMainProcessInfo
,
remoteInfo
:
(
IRemoteDiagnosticInfo
|
IRemoteDiagnosticError
)[]):
Promise
<
SystemInfo
>
;
getDiagnostics
(
mainProcessInfo
:
IMainProcessInfo
,
remoteInfo
:
(
IRemoteDiagnosticInfo
|
IRemoteDiagnosticError
)[]):
Promise
<
string
>
;
reportWorkspaceStats
(
workspace
:
IWorkspaceInformation
):
Promise
<
void
>
;
}
export
interface
VersionInfo
{
vscodeVersion
:
string
;
...
...
src/vs/platform/issue/electron-main/issueService.ts
浏览文件 @
262bb4c4
...
...
@@ -9,7 +9,8 @@ import { parseArgs } from 'vs/platform/environment/node/argv';
import
{
IIssueService
,
IssueReporterData
,
IssueReporterFeatures
,
ProcessExplorerData
}
from
'
vs/platform/issue/node/issue
'
;
import
{
BrowserWindow
,
ipcMain
,
screen
,
Event
,
dialog
}
from
'
electron
'
;
import
{
ILaunchService
}
from
'
vs/platform/launch/electron-main/launchService
'
;
import
{
PerformanceInfo
,
IDiagnosticsService
,
isRemoteDiagnosticError
}
from
'
vs/platform/diagnostics/common/diagnosticsService
'
;
import
{
PerformanceInfo
,
isRemoteDiagnosticError
}
from
'
vs/platform/diagnostics/common/diagnostics
'
;
import
{
IDiagnosticsService
}
from
'
vs/platform/diagnostics/node/diagnosticsService
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
isMacintosh
,
IProcessEnvironment
}
from
'
vs/base/common/platform
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
...
...
src/vs/platform/launch/electron-main/launchService.ts
浏览文件 @
262bb4c4
...
...
@@ -19,7 +19,7 @@ import { BrowserWindow, ipcMain, Event as IpcEvent, app } from 'electron';
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
hasArgs
}
from
'
vs/platform/environment/node/argv
'
;
import
{
coalesce
}
from
'
vs/base/common/arrays
'
;
import
{
IDiagnosticInfoOptions
,
IDiagnosticInfo
,
IRemoteDiagnosticInfo
,
IRemoteDiagnosticError
}
from
'
vs/platform/diagnostics/common/diagnostics
Service
'
;
import
{
IDiagnosticInfoOptions
,
IDiagnosticInfo
,
IRemoteDiagnosticInfo
,
IRemoteDiagnosticError
}
from
'
vs/platform/diagnostics/common/diagnostics
'
;
import
{
IMainProcessInfo
,
IWindowInfo
}
from
'
vs/platform/launch/common/launchService
'
;
export
const
ID
=
'
launchService
'
;
...
...
src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts
浏览文件 @
262bb4c4
...
...
@@ -27,7 +27,7 @@ import { DialogChannel } from 'vs/platform/dialogs/node/dialogIpc';
import
{
DownloadServiceChannel
}
from
'
vs/platform/download/common/downloadIpc
'
;
import
{
LogLevelSetterChannel
}
from
'
vs/platform/log/common/logIpc
'
;
import
{
ipcRenderer
as
ipc
}
from
'
electron
'
;
import
{
IDiagnosticInfoOptions
,
IRemoteDiagnosticInfo
}
from
'
vs/platform/diagnostics/common/diagnostics
Service
'
;
import
{
IDiagnosticInfoOptions
,
IRemoteDiagnosticInfo
}
from
'
vs/platform/diagnostics/common/diagnostics
'
;
import
{
IWorkbenchEnvironmentService
}
from
'
vs/workbench/services/environment/common/environmentService
'
;
import
{
IProgressService
,
IProgress
,
IProgressStep
,
ProgressLocation
}
from
'
vs/platform/progress/common/progress
'
;
import
{
PersistentConnectionEventType
}
from
'
vs/platform/remote/common/remoteAgentConnection
'
;
...
...
src/vs/workbench/contrib/stats/electron-browser/workspaceStats.ts
浏览文件 @
262bb4c4
...
...
@@ -15,7 +15,7 @@ import { endsWith } from 'vs/base/common/strings';
import
{
ITextFileService
,
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
import
{
ISharedProcessService
}
from
'
vs/platform/ipc/electron-browser/sharedProcessService
'
;
import
{
IWorkspaceStatsService
,
Tags
}
from
'
vs/workbench/contrib/stats/common/workspaceStats
'
;
import
{
IWorkspaceInformation
}
from
'
vs/platform/diagnostics/common/diagnostics
Service
'
;
import
{
IWorkspaceInformation
}
from
'
vs/platform/diagnostics/common/diagnostics
'
;
const
SshProtocolMatcher
=
/^
([^
@:
]
+@
)?([^
:
]
+
)
:/
;
const
SshUrlMatcher
=
/^
([^
@:
]
+@
)?([^
:
]
+
)
:
(
.+
)
$/
;
...
...
src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
浏览文件 @
262bb4c4
...
...
@@ -17,7 +17,7 @@ import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions } f
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
RemoteExtensionEnvironmentChannelClient
}
from
'
vs/workbench/services/remote/common/remoteAgentEnvironmentChannel
'
;
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
IDiagnosticInfoOptions
,
IDiagnosticInfo
}
from
'
vs/platform/diagnostics/common/diagnostics
Service
'
;
import
{
IDiagnosticInfoOptions
,
IDiagnosticInfo
}
from
'
vs/platform/diagnostics/common/diagnostics
'
;
import
{
Emitter
}
from
'
vs/base/common/event
'
;
import
{
ISignService
}
from
'
vs/platform/sign/common/sign
'
;
...
...
src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.ts
浏览文件 @
262bb4c4
...
...
@@ -8,7 +8,7 @@ import { URI, UriComponents } from 'vs/base/common/uri';
import
{
IChannel
}
from
'
vs/base/parts/ipc/common/ipc
'
;
import
{
IExtensionDescription
}
from
'
vs/platform/extensions/common/extensions
'
;
import
{
IRemoteAgentEnvironment
}
from
'
vs/platform/remote/common/remoteAgentEnvironment
'
;
import
{
IDiagnosticInfoOptions
,
IDiagnosticInfo
}
from
'
vs/platform/diagnostics/common/diagnostics
Service
'
;
import
{
IDiagnosticInfoOptions
,
IDiagnosticInfo
}
from
'
vs/platform/diagnostics/common/diagnostics
'
;
export
interface
IGetEnvironmentDataArguments
{
language
:
string
;
...
...
src/vs/workbench/services/remote/common/remoteAgentService.ts
浏览文件 @
262bb4c4
...
...
@@ -6,7 +6,7 @@
import
{
createDecorator
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
RemoteAgentConnectionContext
,
IRemoteAgentEnvironment
}
from
'
vs/platform/remote/common/remoteAgentEnvironment
'
;
import
{
IChannel
,
IServerChannel
}
from
'
vs/base/parts/ipc/common/ipc
'
;
import
{
IDiagnosticInfoOptions
,
IDiagnosticInfo
}
from
'
vs/platform/diagnostics/common/diagnostics
Service
'
;
import
{
IDiagnosticInfoOptions
,
IDiagnosticInfo
}
from
'
vs/platform/diagnostics/common/diagnostics
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
PersistenConnectionEvent
as
PersistentConnectionEvent
,
ISocketFactory
}
from
'
vs/platform/remote/common/remoteAgentConnection
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录