Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
300eea40
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
300eea40
编写于
7月 22, 2019
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix typo
上级
78f73b97
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
19 deletion
+19
-19
src/vs/platform/remote/common/remoteAgentConnection.ts
src/vs/platform/remote/common/remoteAgentConnection.ts
+6
-6
src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts
...ch/contrib/remote/electron-browser/remote.contribution.ts
+11
-11
src/vs/workbench/services/extensions/electron-browser/extensionService.ts
.../services/extensions/electron-browser/extensionService.ts
+2
-2
未找到文件。
src/vs/platform/remote/common/remoteAgentConnection.ts
浏览文件 @
300eea40
...
@@ -256,7 +256,7 @@ function sleep(seconds: number): Promise<void> {
...
@@ -256,7 +256,7 @@ function sleep(seconds: number): Promise<void> {
});
});
}
}
export
const
enum
PersistenConnectionEventType
{
export
const
enum
Persisten
t
ConnectionEventType
{
ConnectionLost
,
ConnectionLost
,
ReconnectionWait
,
ReconnectionWait
,
ReconnectionRunning
,
ReconnectionRunning
,
...
@@ -264,22 +264,22 @@ export const enum PersistenConnectionEventType {
...
@@ -264,22 +264,22 @@ export const enum PersistenConnectionEventType {
ConnectionGain
ConnectionGain
}
}
export
class
ConnectionLostEvent
{
export
class
ConnectionLostEvent
{
public
readonly
type
=
PersistenConnectionEventType
.
ConnectionLost
;
public
readonly
type
=
Persisten
t
ConnectionEventType
.
ConnectionLost
;
}
}
export
class
ReconnectionWaitEvent
{
export
class
ReconnectionWaitEvent
{
public
readonly
type
=
PersistenConnectionEventType
.
ReconnectionWait
;
public
readonly
type
=
Persisten
t
ConnectionEventType
.
ReconnectionWait
;
constructor
(
constructor
(
public
readonly
durationSeconds
:
number
public
readonly
durationSeconds
:
number
)
{
}
)
{
}
}
}
export
class
ReconnectionRunningEvent
{
export
class
ReconnectionRunningEvent
{
public
readonly
type
=
PersistenConnectionEventType
.
ReconnectionRunning
;
public
readonly
type
=
Persisten
t
ConnectionEventType
.
ReconnectionRunning
;
}
}
export
class
ConnectionGainEvent
{
export
class
ConnectionGainEvent
{
public
readonly
type
=
PersistenConnectionEventType
.
ConnectionGain
;
public
readonly
type
=
Persisten
t
ConnectionEventType
.
ConnectionGain
;
}
}
export
class
ReconnectionPermanentFailureEvent
{
export
class
ReconnectionPermanentFailureEvent
{
public
readonly
type
=
PersistenConnectionEventType
.
ReconnectionPermanentFailure
;
public
readonly
type
=
Persisten
t
ConnectionEventType
.
ReconnectionPermanentFailure
;
}
}
export
type
PersistenConnectionEvent
=
ConnectionGainEvent
|
ConnectionLostEvent
|
ReconnectionWaitEvent
|
ReconnectionRunningEvent
|
ReconnectionPermanentFailureEvent
;
export
type
PersistenConnectionEvent
=
ConnectionGainEvent
|
ConnectionLostEvent
|
ReconnectionWaitEvent
|
ReconnectionRunningEvent
|
ReconnectionPermanentFailureEvent
;
...
...
src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts
浏览文件 @
300eea40
...
@@ -30,7 +30,7 @@ import { ipcRenderer as ipc } from 'electron';
...
@@ -30,7 +30,7 @@ import { ipcRenderer as ipc } from 'electron';
import
{
IDiagnosticInfoOptions
,
IRemoteDiagnosticInfo
}
from
'
vs/platform/diagnostics/common/diagnosticsService
'
;
import
{
IDiagnosticInfoOptions
,
IRemoteDiagnosticInfo
}
from
'
vs/platform/diagnostics/common/diagnosticsService
'
;
import
{
IWorkbenchEnvironmentService
}
from
'
vs/workbench/services/environment/common/environmentService
'
;
import
{
IWorkbenchEnvironmentService
}
from
'
vs/workbench/services/environment/common/environmentService
'
;
import
{
IProgressService
,
IProgress
,
IProgressStep
,
ProgressLocation
}
from
'
vs/platform/progress/common/progress
'
;
import
{
IProgressService
,
IProgress
,
IProgressStep
,
ProgressLocation
}
from
'
vs/platform/progress/common/progress
'
;
import
{
PersistenConnectionEventType
}
from
'
vs/platform/remote/common/remoteAgentConnection
'
;
import
{
Persisten
t
ConnectionEventType
}
from
'
vs/platform/remote/common/remoteAgentConnection
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IConfigurationRegistry
,
Extensions
as
ConfigurationExtensions
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
IConfigurationRegistry
,
Extensions
as
ConfigurationExtensions
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
Severity
from
'
vs/base/common/severity
'
;
import
Severity
from
'
vs/base/common/severity
'
;
...
@@ -101,13 +101,13 @@ export class RemoteWindowActiveIndicator extends Disposable implements IWorkbenc
...
@@ -101,13 +101,13 @@ export class RemoteWindowActiveIndicator extends Disposable implements IWorkbenc
if
(
connection
)
{
if
(
connection
)
{
this
.
_register
(
connection
.
onDidStateChange
((
e
)
=>
{
this
.
_register
(
connection
.
onDidStateChange
((
e
)
=>
{
switch
(
e
.
type
)
{
switch
(
e
.
type
)
{
case
PersistenConnectionEventType
.
ConnectionLost
:
case
Persisten
t
ConnectionEventType
.
ConnectionLost
:
case
PersistenConnectionEventType
.
ReconnectionPermanentFailure
:
case
Persisten
t
ConnectionEventType
.
ReconnectionPermanentFailure
:
case
PersistenConnectionEventType
.
ReconnectionRunning
:
case
Persisten
t
ConnectionEventType
.
ReconnectionRunning
:
case
PersistenConnectionEventType
.
ReconnectionWait
:
case
Persisten
t
ConnectionEventType
.
ReconnectionWait
:
this
.
setDisconnected
(
true
);
this
.
setDisconnected
(
true
);
break
;
break
;
case
PersistenConnectionEventType
.
ConnectionGain
:
case
Persisten
t
ConnectionEventType
.
ConnectionGain
:
this
.
setDisconnected
(
false
);
this
.
setDisconnected
(
false
);
break
;
break
;
}
}
...
@@ -298,7 +298,7 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
...
@@ -298,7 +298,7 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
currentTimer
=
null
;
currentTimer
=
null
;
}
}
switch
(
e
.
type
)
{
switch
(
e
.
type
)
{
case
PersistenConnectionEventType
.
ConnectionLost
:
case
Persisten
t
ConnectionEventType
.
ConnectionLost
:
if
(
!
currentProgressPromiseResolve
)
{
if
(
!
currentProgressPromiseResolve
)
{
let
promise
=
new
Promise
<
void
>
((
resolve
)
=>
currentProgressPromiseResolve
=
resolve
);
let
promise
=
new
Promise
<
void
>
((
resolve
)
=>
currentProgressPromiseResolve
=
resolve
);
progressService
!
.
withProgress
(
progressService
!
.
withProgress
(
...
@@ -315,13 +315,13 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
...
@@ -315,13 +315,13 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
progressReporter
!
.
report
(
nls
.
localize
(
'
connectionLost
'
,
"
Connection Lost
"
));
progressReporter
!
.
report
(
nls
.
localize
(
'
connectionLost
'
,
"
Connection Lost
"
));
break
;
break
;
case
PersistenConnectionEventType
.
ReconnectionWait
:
case
Persisten
t
ConnectionEventType
.
ReconnectionWait
:
currentTimer
=
new
ReconnectionTimer
(
progressReporter
!
,
Date
.
now
()
+
1000
*
e
.
durationSeconds
);
currentTimer
=
new
ReconnectionTimer
(
progressReporter
!
,
Date
.
now
()
+
1000
*
e
.
durationSeconds
);
break
;
break
;
case
PersistenConnectionEventType
.
ReconnectionRunning
:
case
Persisten
t
ConnectionEventType
.
ReconnectionRunning
:
progressReporter
!
.
report
(
nls
.
localize
(
'
reconnectionRunning
'
,
"
Attempting to reconnect...
"
));
progressReporter
!
.
report
(
nls
.
localize
(
'
reconnectionRunning
'
,
"
Attempting to reconnect...
"
));
break
;
break
;
case
PersistenConnectionEventType
.
ReconnectionPermanentFailure
:
case
Persisten
t
ConnectionEventType
.
ReconnectionPermanentFailure
:
currentProgressPromiseResolve
!
();
currentProgressPromiseResolve
!
();
currentProgressPromiseResolve
=
null
;
currentProgressPromiseResolve
=
null
;
progressReporter
=
null
;
progressReporter
=
null
;
...
@@ -333,7 +333,7 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
...
@@ -333,7 +333,7 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
}
}
});
});
break
;
break
;
case
PersistenConnectionEventType
.
ConnectionGain
:
case
Persisten
t
ConnectionEventType
.
ConnectionGain
:
currentProgressPromiseResolve
!
();
currentProgressPromiseResolve
!
();
currentProgressPromiseResolve
=
null
;
currentProgressPromiseResolve
=
null
;
progressReporter
=
null
;
progressReporter
=
null
;
...
...
src/vs/workbench/services/extensions/electron-browser/extensionService.ts
浏览文件 @
300eea40
...
@@ -32,7 +32,7 @@ import { ExtensionHostProcessManager } from 'vs/workbench/services/extensions/co
...
@@ -32,7 +32,7 @@ import { ExtensionHostProcessManager } from 'vs/workbench/services/extensions/co
import
{
ExtensionIdentifier
,
IExtension
,
ExtensionType
,
IExtensionDescription
}
from
'
vs/platform/extensions/common/extensions
'
;
import
{
ExtensionIdentifier
,
IExtension
,
ExtensionType
,
IExtensionDescription
}
from
'
vs/platform/extensions/common/extensions
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
import
{
PersistenConnectionEventType
}
from
'
vs/platform/remote/common/remoteAgentConnection
'
;
import
{
Persisten
t
ConnectionEventType
}
from
'
vs/platform/remote/common/remoteAgentConnection
'
;
import
{
IProductService
}
from
'
vs/platform/product/common/product
'
;
import
{
IProductService
}
from
'
vs/platform/product/common/product
'
;
import
{
Logger
}
from
'
vs/workbench/services/extensions/common/extensionPoints
'
;
import
{
Logger
}
from
'
vs/workbench/services/extensions/common/extensionPoints
'
;
...
@@ -473,7 +473,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
...
@@ -473,7 +473,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten
if
(
!
remoteAuthority
)
{
if
(
!
remoteAuthority
)
{
return
;
return
;
}
}
if
(
e
.
type
===
PersistenConnectionEventType
.
ConnectionLost
)
{
if
(
e
.
type
===
Persisten
t
ConnectionEventType
.
ConnectionLost
)
{
this
.
_remoteAuthorityResolverService
.
clearResolvedAuthority
(
remoteAuthority
);
this
.
_remoteAuthorityResolverService
.
clearResolvedAuthority
(
remoteAuthority
);
}
}
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录