Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
7c90b16f
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
7c90b16f
编写于
9月 16, 2020
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
sandbox - lift remoteAuthorityService to electron-sandbox
上级
11275a93
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
6 addition
and
19 deletion
+6
-19
src/vs/platform/remote/electron-sandbox/remoteAuthorityResolverService.ts
...remote/electron-sandbox/remoteAuthorityResolverService.ts
+1
-1
src/vs/workbench/electron-browser/desktop.main.ts
src/vs/workbench/electron-browser/desktop.main.ts
+1
-1
src/vs/workbench/electron-sandbox/desktop.main.ts
src/vs/workbench/electron-sandbox/desktop.main.ts
+3
-2
src/vs/workbench/electron-sandbox/sandbox.simpleservices.ts
src/vs/workbench/electron-sandbox/sandbox.simpleservices.ts
+0
-14
src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
...ration/test/electron-browser/configurationService.test.ts
+1
-1
未找到文件。
src/vs/platform/remote/electron-
browser
/remoteAuthorityResolverService.ts
→
src/vs/platform/remote/electron-
sandbox
/remoteAuthorityResolverService.ts
浏览文件 @
7c90b16f
...
...
@@ -2,7 +2,7 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
//
import
{
ResolvedAuthority
,
IRemoteAuthorityResolverService
,
ResolverResult
,
ResolvedOptions
,
IRemoteConnectionData
}
from
'
vs/platform/remote/common/remoteAuthorityResolver
'
;
import
*
as
errors
from
'
vs/base/common/errors
'
;
import
{
RemoteAuthorities
}
from
'
vs/base/common/network
'
;
...
...
src/vs/workbench/electron-browser/desktop.main.ts
浏览文件 @
7c90b16f
...
...
@@ -30,7 +30,7 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
import
{
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
registerWindowDriver
}
from
'
vs/platform/driver/electron-browser/driver
'
;
import
{
IMainProcessService
,
MainProcessService
}
from
'
vs/platform/ipc/electron-sandbox/mainProcessService
'
;
import
{
RemoteAuthorityResolverService
}
from
'
vs/platform/remote/electron-
browser
/remoteAuthorityResolverService
'
;
import
{
RemoteAuthorityResolverService
}
from
'
vs/platform/remote/electron-
sandbox
/remoteAuthorityResolverService
'
;
import
{
IRemoteAuthorityResolverService
}
from
'
vs/platform/remote/common/remoteAuthorityResolver
'
;
import
{
RemoteAgentService
}
from
'
vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl
'
;
import
{
IRemoteAgentService
}
from
'
vs/workbench/services/remote/common/remoteAgentService
'
;
...
...
src/vs/workbench/electron-sandbox/desktop.main.ts
浏览文件 @
7c90b16f
...
...
@@ -31,8 +31,9 @@ import { IProductService } from 'vs/platform/product/common/productService';
import
product
from
'
vs/platform/product/common/product
'
;
import
{
IResourceIdentityService
}
from
'
vs/platform/resource/common/resourceIdentityService
'
;
import
{
IElectronService
,
ElectronService
}
from
'
vs/platform/electron/electron-sandbox/electron
'
;
import
{
SimpleConfigurationService
,
simpleFileSystemProvider
,
SimpleLogService
,
SimpleRemoteAgentService
,
SimpleRe
moteAuthorityResolverService
,
SimpleRe
sourceIdentityService
,
SimpleSignService
,
SimpleStorageService
,
SimpleWorkbenchEnvironmentService
,
SimpleWorkspaceService
}
from
'
vs/workbench/electron-sandbox/sandbox.simpleservices
'
;
import
{
SimpleConfigurationService
,
simpleFileSystemProvider
,
SimpleLogService
,
SimpleRemoteAgentService
,
SimpleResourceIdentityService
,
SimpleSignService
,
SimpleStorageService
,
SimpleWorkbenchEnvironmentService
,
SimpleWorkspaceService
}
from
'
vs/workbench/electron-sandbox/sandbox.simpleservices
'
;
import
{
INativeWorkbenchConfiguration
}
from
'
vs/workbench/services/environment/electron-sandbox/environmentService
'
;
import
{
RemoteAuthorityResolverService
}
from
'
vs/platform/remote/electron-sandbox/remoteAuthorityResolverService
'
;
class
DesktopMain
extends
Disposable
{
...
...
@@ -159,7 +160,7 @@ class DesktopMain extends Disposable {
serviceCollection
.
set
(
ILogService
,
logService
);
// Remote
const
remoteAuthorityResolverService
=
new
Simple
RemoteAuthorityResolverService
();
const
remoteAuthorityResolverService
=
new
RemoteAuthorityResolverService
();
serviceCollection
.
set
(
IRemoteAuthorityResolverService
,
remoteAuthorityResolverService
);
// Sign
...
...
src/vs/workbench/electron-sandbox/sandbox.simpleservices.ts
浏览文件 @
7c90b16f
...
...
@@ -12,7 +12,6 @@ import { ISignService } from 'vs/platform/sign/common/sign';
import
{
hash
}
from
'
vs/base/common/hash
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
InMemoryFileSystemProvider
}
from
'
vs/platform/files/common/inMemoryFilesystemProvider
'
;
import
{
IRemoteAuthorityResolverService
,
IRemoteConnectionData
,
ResolvedAuthority
,
ResolvedOptions
,
ResolverResult
}
from
'
vs/platform/remote/common/remoteAuthorityResolver
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
IRemoteAgentConnection
,
IRemoteAgentService
}
from
'
vs/workbench/services/remote/common/remoteAgentService
'
;
import
{
IDiagnosticInfoOptions
,
IDiagnosticInfo
}
from
'
vs/platform/diagnostics/common/diagnostics
'
;
...
...
@@ -437,19 +436,6 @@ export class SimpleResourceIdentityService implements IResourceIdentityService {
//#region Remote
export
class
SimpleRemoteAuthorityResolverService
implements
IRemoteAuthorityResolverService
{
declare
readonly
_serviceBrand
:
undefined
;
onDidChangeConnectionData
:
Event
<
void
>
=
Event
.
None
;
resolveAuthority
(
authority
:
string
):
Promise
<
ResolverResult
>
{
throw
new
Error
(
'
Method not implemented.
'
);
}
getConnectionData
(
authority
:
string
):
IRemoteConnectionData
|
null
{
return
null
;
}
_clearResolvedAuthority
(
authority
:
string
):
void
{
}
_setResolvedAuthority
(
resolvedAuthority
:
ResolvedAuthority
,
resolvedOptions
?:
ResolvedOptions
):
void
{
}
_setResolvedAuthorityError
(
authority
:
string
,
err
:
any
):
void
{
}
_setAuthorityConnectionToken
(
authority
:
string
,
connectionToken
:
string
):
void
{
}
}
export
class
SimpleRemoteAgentService
implements
IRemoteAgentService
{
declare
readonly
_serviceBrand
:
undefined
;
...
...
src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
浏览文件 @
7c90b16f
...
...
@@ -33,7 +33,7 @@ import { Schemas } from 'vs/base/common/network';
import
{
originalFSPath
,
joinPath
}
from
'
vs/base/common/resources
'
;
import
{
isLinux
,
isMacintosh
}
from
'
vs/base/common/platform
'
;
import
{
RemoteAgentService
}
from
'
vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl
'
;
import
{
RemoteAuthorityResolverService
}
from
'
vs/platform/remote/electron-
browser
/remoteAuthorityResolverService
'
;
import
{
RemoteAuthorityResolverService
}
from
'
vs/platform/remote/electron-
sandbox
/remoteAuthorityResolverService
'
;
import
{
IRemoteAgentService
}
from
'
vs/workbench/services/remote/common/remoteAgentService
'
;
import
{
FileService
}
from
'
vs/platform/files/common/fileService
'
;
import
{
NullLogService
}
from
'
vs/platform/log/common/log
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录