Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
5f53f7c7
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,发现更多精彩内容 >>
提交
5f53f7c7
编写于
8月 18, 2016
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove debugBrkFileWatcherPort
上级
e4b31697
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
2 addition
and
38 deletion
+2
-38
src/vs/code/electron-main/env.ts
src/vs/code/electron-main/env.ts
+0
-16
src/vs/code/electron-main/window.ts
src/vs/code/electron-main/window.ts
+0
-1
src/vs/code/electron-main/windows.ts
src/vs/code/electron-main/windows.ts
+0
-1
src/vs/code/node/argv.ts
src/vs/code/node/argv.ts
+0
-1
src/vs/platform/environment/common/environment.ts
src/vs/platform/environment/common/environment.ts
+0
-2
src/vs/platform/environment/node/environmentService.ts
src/vs/platform/environment/node/environmentService.ts
+0
-5
src/vs/workbench/services/files/electron-browser/fileService.ts
.../workbench/services/files/electron-browser/fileService.ts
+0
-5
src/vs/workbench/services/files/node/fileService.ts
src/vs/workbench/services/files/node/fileService.ts
+1
-2
src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
...kbench/services/files/node/watcher/unix/watcherService.ts
+1
-5
未找到文件。
src/vs/code/electron-main/env.ts
浏览文件 @
5f53f7c7
...
@@ -55,20 +55,6 @@ export interface IEnvService {
...
@@ -55,20 +55,6 @@ export interface IEnvService {
createPaths
():
TPromise
<
void
>
;
createPaths
():
TPromise
<
void
>
;
}
}
function
getNumericValue
(
value
:
string
,
defaultValue
:
number
,
fallback
:
number
=
void
0
)
{
const
numericValue
=
parseInt
(
value
);
if
(
types
.
isNumber
(
numericValue
))
{
return
numericValue
;
}
if
(
value
)
{
return
defaultValue
;
}
return
fallback
;
}
export
class
EnvService
implements
IEnvService
{
export
class
EnvService
implements
IEnvService
{
_serviceBrand
:
any
;
_serviceBrand
:
any
;
...
@@ -143,7 +129,6 @@ export class EnvService implements IEnvService {
...
@@ -143,7 +129,6 @@ export class EnvService implements IEnvService {
const
argv
=
parseArgs
(
args
);
const
argv
=
parseArgs
(
args
);
const
paths
=
parsePathArguments
(
this
.
_currentWorkingDirectory
,
argv
.
_
,
argv
.
goto
);
const
paths
=
parsePathArguments
(
this
.
_currentWorkingDirectory
,
argv
.
_
,
argv
.
goto
);
const
debugBrkFileWatcherPort
=
getNumericValue
(
argv
.
debugBrkFileWatcherPort
,
void
0
);
this
.
_cliArgs
=
Object
.
freeze
({
this
.
_cliArgs
=
Object
.
freeze
({
_
:
[],
_
:
[],
...
@@ -153,7 +138,6 @@ export class EnvService implements IEnvService {
...
@@ -153,7 +138,6 @@ export class EnvService implements IEnvService {
debugPluginHost
:
argv
.
debugPluginHost
,
debugPluginHost
:
argv
.
debugPluginHost
,
debugBrkPluginHost
:
argv
.
debugBrkPluginHost
,
debugBrkPluginHost
:
argv
.
debugBrkPluginHost
,
logExtensionHostCommunication
:
argv
.
logExtensionHostCommunication
,
logExtensionHostCommunication
:
argv
.
logExtensionHostCommunication
,
debugBrkFileWatcherPort
:
debugBrkFileWatcherPort
?
String
(
debugBrkFileWatcherPort
)
:
void
0
,
'
new-window
'
:
argv
[
'
new-window
'
],
'
new-window
'
:
argv
[
'
new-window
'
],
'
reuse-window
'
:
argv
[
'
reuse-window
'
],
'
reuse-window
'
:
argv
[
'
reuse-window
'
],
goto
:
argv
.
goto
,
goto
:
argv
.
goto
,
...
...
src/vs/code/electron-main/window.ts
浏览文件 @
5f53f7c7
...
@@ -378,7 +378,6 @@ export class VSCodeWindow {
...
@@ -378,7 +378,6 @@ export class VSCodeWindow {
// in plugin development mode. These options are all development related.
// in plugin development mode. These options are all development related.
if
(
this
.
isPluginDevelopmentHost
&&
cli
)
{
if
(
this
.
isPluginDevelopmentHost
&&
cli
)
{
configuration
.
verbose
=
cli
.
verbose
;
configuration
.
verbose
=
cli
.
verbose
;
configuration
.
debugBrkFileWatcherPort
=
cli
.
debugBrkFileWatcherPort
;
configuration
.
debugPluginHost
=
cli
.
debugPluginHost
;
configuration
.
debugPluginHost
=
cli
.
debugPluginHost
;
configuration
.
debugBrkPluginHost
=
cli
.
debugBrkPluginHost
;
configuration
.
debugBrkPluginHost
=
cli
.
debugBrkPluginHost
;
configuration
.
extensionHomePath
=
cli
.
extensionHomePath
;
configuration
.
extensionHomePath
=
cli
.
extensionHomePath
;
...
...
src/vs/code/electron-main/windows.ts
浏览文件 @
5f53f7c7
...
@@ -906,7 +906,6 @@ export class WindowsManager implements IWindowsService {
...
@@ -906,7 +906,6 @@ export class WindowsManager implements IWindowsService {
if
(
!
configuration
.
extensionDevelopmentPath
&&
currentWindowConfig
&&
!!
currentWindowConfig
.
extensionDevelopmentPath
)
{
if
(
!
configuration
.
extensionDevelopmentPath
&&
currentWindowConfig
&&
!!
currentWindowConfig
.
extensionDevelopmentPath
)
{
configuration
.
extensionDevelopmentPath
=
currentWindowConfig
.
extensionDevelopmentPath
;
configuration
.
extensionDevelopmentPath
=
currentWindowConfig
.
extensionDevelopmentPath
;
configuration
.
verbose
=
currentWindowConfig
.
verbose
;
configuration
.
verbose
=
currentWindowConfig
.
verbose
;
configuration
.
debugBrkFileWatcherPort
=
currentWindowConfig
.
debugBrkFileWatcherPort
;
configuration
.
debugBrkPluginHost
=
currentWindowConfig
.
debugBrkPluginHost
;
configuration
.
debugBrkPluginHost
=
currentWindowConfig
.
debugBrkPluginHost
;
configuration
.
debugPluginHost
=
currentWindowConfig
.
debugPluginHost
;
configuration
.
debugPluginHost
=
currentWindowConfig
.
debugPluginHost
;
configuration
.
extensionHomePath
=
currentWindowConfig
.
extensionHomePath
;
configuration
.
extensionHomePath
=
currentWindowConfig
.
extensionHomePath
;
...
...
src/vs/code/node/argv.ts
浏览文件 @
5f53f7c7
...
@@ -20,7 +20,6 @@ export interface ParsedArgs extends minimist.ParsedArgs {
...
@@ -20,7 +20,6 @@ export interface ParsedArgs extends minimist.ParsedArgs {
performance
?:
boolean
;
performance
?:
boolean
;
verbose
?:
boolean
;
verbose
?:
boolean
;
logExtensionHostCommunication
?:
boolean
;
logExtensionHostCommunication
?:
boolean
;
debugBrkFileWatcherPort
?:
string
;
'
disable-extensions
'
?:
boolean
;
'
disable-extensions
'
?:
boolean
;
extensionHomePath
?:
string
;
extensionHomePath
?:
string
;
extensionDevelopmentPath
?:
string
;
extensionDevelopmentPath
?:
string
;
...
...
src/vs/platform/environment/common/environment.ts
浏览文件 @
5f53f7c7
...
@@ -33,6 +33,4 @@ export interface IEnvironmentService {
...
@@ -33,6 +33,4 @@ export interface IEnvironmentService {
isBuilt
:
boolean
;
isBuilt
:
boolean
;
verbose
:
boolean
;
verbose
:
boolean
;
performance
:
boolean
;
performance
:
boolean
;
debugBrkFileWatcherPort
:
number
;
}
}
\ No newline at end of file
src/vs/platform/environment/node/environmentService.ts
浏览文件 @
5f53f7c7
...
@@ -61,9 +61,6 @@ export class EnvironmentService implements IEnvironmentService {
...
@@ -61,9 +61,6 @@ export class EnvironmentService implements IEnvironmentService {
get
performance
():
boolean
{
return
this
.
args
.
performance
;
}
get
performance
():
boolean
{
return
this
.
args
.
performance
;
}
get
logExtensionHostCommunication
():
boolean
{
return
this
.
args
.
logExtensionHostCommunication
;
}
get
logExtensionHostCommunication
():
boolean
{
return
this
.
args
.
logExtensionHostCommunication
;
}
private
_debugBrkFileWatcherPort
:
number
;
get
debugBrkFileWatcherPort
():
number
{
return
this
.
_debugBrkFileWatcherPort
;
}
constructor
(
private
args
:
IEnvironment
)
{
constructor
(
private
args
:
IEnvironment
)
{
this
.
_appRoot
=
path
.
dirname
(
URI
.
parse
(
require
.
toUrl
(
''
)).
fsPath
);
this
.
_appRoot
=
path
.
dirname
(
URI
.
parse
(
require
.
toUrl
(
''
)).
fsPath
);
this
.
_userDataPath
=
args
[
'
user-data-dir
'
]
||
paths
.
getDefaultUserDataPath
(
process
.
platform
);
this
.
_userDataPath
=
args
[
'
user-data-dir
'
]
||
paths
.
getDefaultUserDataPath
(
process
.
platform
);
...
@@ -81,8 +78,6 @@ export class EnvironmentService implements IEnvironmentService {
...
@@ -81,8 +78,6 @@ export class EnvironmentService implements IEnvironmentService {
const
{
port
,
brk
}
=
parseExtensionHostPort
(
args
,
this
.
isBuilt
);
const
{
port
,
brk
}
=
parseExtensionHostPort
(
args
,
this
.
isBuilt
);
this
.
_debugExtensionHostPort
=
port
;
this
.
_debugExtensionHostPort
=
port
;
this
.
_debugBrkExtensionHost
=
brk
;
this
.
_debugBrkExtensionHost
=
brk
;
this
.
_debugBrkFileWatcherPort
=
(
typeof
args
.
debugBrkFileWatcherPort
===
'
string
'
)
?
Number
(
args
.
debugBrkFileWatcherPort
)
:
void
0
;
}
}
}
}
...
...
src/vs/workbench/services/files/electron-browser/fileService.ts
浏览文件 @
5f53f7c7
...
@@ -63,13 +63,8 @@ export class FileService implements IFileService {
...
@@ -63,13 +63,8 @@ export class FileService implements IFileService {
encodingOverride
:
encodingOverride
,
encodingOverride
:
encodingOverride
,
watcherIgnoredPatterns
:
watcherIgnoredPatterns
,
watcherIgnoredPatterns
:
watcherIgnoredPatterns
,
verboseLogging
:
environmentService
.
verbose
,
verboseLogging
:
environmentService
.
verbose
,
debugBrkFileWatcherPort
:
environmentService
.
debugBrkFileWatcherPort
};
};
if
(
typeof
environmentService
.
debugBrkFileWatcherPort
===
'
number
'
)
{
console
.
warn
(
`File Watcher STOPPED on first line for debugging on port
${
environmentService
.
debugBrkFileWatcherPort
}
`
);
}
// create service
// create service
let
workspace
=
this
.
contextService
.
getWorkspace
();
let
workspace
=
this
.
contextService
.
getWorkspace
();
this
.
raw
=
new
NodeFileService
(
workspace
?
workspace
.
resource
.
fsPath
:
void
0
,
fileServiceConfig
,
this
.
eventService
);
this
.
raw
=
new
NodeFileService
(
workspace
?
workspace
.
resource
.
fsPath
:
void
0
,
fileServiceConfig
,
this
.
eventService
);
...
...
src/vs/workbench/services/files/node/fileService.ts
浏览文件 @
5f53f7c7
...
@@ -47,7 +47,6 @@ export interface IFileServiceOptions {
...
@@ -47,7 +47,6 @@ export interface IFileServiceOptions {
watcherIgnoredPatterns
?:
string
[];
watcherIgnoredPatterns
?:
string
[];
disableWatcher
?:
boolean
;
disableWatcher
?:
boolean
;
verboseLogging
?:
boolean
;
verboseLogging
?:
boolean
;
debugBrkFileWatcherPort
?:
number
;
}
}
function
etag
(
stat
:
fs
.
Stats
):
string
;
function
etag
(
stat
:
fs
.
Stats
):
string
;
...
@@ -129,7 +128,7 @@ export class FileService implements IFileService {
...
@@ -129,7 +128,7 @@ export class FileService implements IFileService {
}
}
private
setupUnixWorkspaceWatching
():
void
{
private
setupUnixWorkspaceWatching
():
void
{
this
.
workspaceWatcherToDispose
=
new
UnixWatcherService
(
this
.
basePath
,
this
.
options
.
watcherIgnoredPatterns
,
this
.
eventEmitter
,
this
.
options
.
errorLogger
,
this
.
options
.
verboseLogging
,
this
.
options
.
debugBrkFileWatcherPort
).
startWatching
();
this
.
workspaceWatcherToDispose
=
new
UnixWatcherService
(
this
.
basePath
,
this
.
options
.
watcherIgnoredPatterns
,
this
.
eventEmitter
,
this
.
options
.
errorLogger
,
this
.
options
.
verboseLogging
).
startWatching
();
}
}
public
resolveFile
(
resource
:
uri
,
options
?:
IResolveFileOptions
):
TPromise
<
IFileStat
>
{
public
resolveFile
(
resource
:
uri
,
options
?:
IResolveFileOptions
):
TPromise
<
IFileStat
>
{
...
...
src/vs/workbench/services/files/node/watcher/unix/watcherService.ts
浏览文件 @
5f53f7c7
...
@@ -25,8 +25,7 @@ export class FileWatcher {
...
@@ -25,8 +25,7 @@ export class FileWatcher {
private
ignored
:
string
[],
private
ignored
:
string
[],
private
eventEmitter
:
IEventService
,
private
eventEmitter
:
IEventService
,
private
errorLogger
:
(
msg
:
string
)
=>
void
,
private
errorLogger
:
(
msg
:
string
)
=>
void
,
private
verboseLogging
:
boolean
,
private
verboseLogging
:
boolean
private
debugBrkFileWatcherPort
:
number
)
{
)
{
this
.
isDisposed
=
false
;
this
.
isDisposed
=
false
;
this
.
restartCounter
=
0
;
this
.
restartCounter
=
0
;
...
@@ -34,9 +33,6 @@ export class FileWatcher {
...
@@ -34,9 +33,6 @@ export class FileWatcher {
public
startWatching
():
()
=>
void
{
public
startWatching
():
()
=>
void
{
const
args
=
[
'
--type=watcherService
'
];
const
args
=
[
'
--type=watcherService
'
];
if
(
typeof
this
.
debugBrkFileWatcherPort
===
'
number
'
)
{
args
.
push
(
`--debug-brk=
${
this
.
debugBrkFileWatcherPort
}
`
);
}
const
client
=
new
Client
(
const
client
=
new
Client
(
uri
.
parse
(
require
.
toUrl
(
'
bootstrap
'
)).
fsPath
,
uri
.
parse
(
require
.
toUrl
(
'
bootstrap
'
)).
fsPath
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录