Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
dffbeac1
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,发现更多精彩内容 >>
提交
dffbeac1
编写于
8月 17, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use execPath from remote (node => electron-browser)
上级
413a1db6
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
19 addition
and
12 deletion
+19
-12
src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
...parts/debug/electron-browser/debugConfigurationManager.ts
+1
-1
src/vs/workbench/parts/debug/electron-browser/debugService.ts
...vs/workbench/parts/debug/electron-browser/debugService.ts
+1
-1
src/vs/workbench/parts/lib/electron-browser/configVariables.ts
...s/workbench/parts/lib/electron-browser/configVariables.ts
+0
-0
src/vs/workbench/parts/lib/electron-browser/systemVariables.ts
...s/workbench/parts/lib/electron-browser/systemVariables.ts
+9
-2
src/vs/workbench/parts/lib/test/electron-browser/configVariables.test.ts
...h/parts/lib/test/electron-browser/configVariables.test.ts
+1
-1
src/vs/workbench/parts/lib/test/electron-browser/systemVariables.test.ts
...h/parts/lib/test/electron-browser/systemVariables.test.ts
+1
-1
src/vs/workbench/parts/tasks/electron-browser/processRunnerConfiguration.ts
...arts/tasks/electron-browser/processRunnerConfiguration.ts
+0
-0
src/vs/workbench/parts/tasks/electron-browser/processRunnerDetector.ts
...nch/parts/tasks/electron-browser/processRunnerDetector.ts
+1
-1
src/vs/workbench/parts/tasks/electron-browser/processRunnerSystem.ts
...bench/parts/tasks/electron-browser/processRunnerSystem.ts
+0
-0
src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
...rkbench/parts/tasks/electron-browser/task.contribution.ts
+4
-4
src/vs/workbench/parts/tasks/test/electron-browser/configuration.test.ts
...h/parts/tasks/test/electron-browser/configuration.test.ts
+1
-1
未找到文件。
src/vs/workbench/parts/debug/
node
/debugConfigurationManager.ts
→
src/vs/workbench/parts/debug/
electron-browser
/debugConfigurationManager.ts
浏览文件 @
dffbeac1
...
...
@@ -29,7 +29,7 @@ import {Adapter} from 'vs/workbench/parts/debug/node/debugAdapter';
import
{
IWorkspaceContextService
}
from
'
vs/workbench/services/workspace/common/contextService
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IQuickOpenService
}
from
'
vs/workbench/services/quickopen/common/quickOpenService
'
;
import
{
ConfigVariables
}
from
'
vs/workbench/parts/lib/
node
/configVariables
'
;
import
{
ConfigVariables
}
from
'
vs/workbench/parts/lib/
electron-browser
/configVariables
'
;
import
{
ISystemVariables
}
from
'
vs/base/common/parsers
'
;
// debuggers extension point
...
...
src/vs/workbench/parts/debug/electron-browser/debugService.ts
浏览文件 @
dffbeac1
...
...
@@ -37,7 +37,7 @@ import model = require('vs/workbench/parts/debug/common/debugModel');
import
{
DebugStringEditorInput
}
from
'
vs/workbench/parts/debug/browser/debugEditorInputs
'
;
import
viewmodel
=
require
(
'
vs/workbench/parts/debug/common/debugViewModel
'
);
import
debugactions
=
require
(
'
vs/workbench/parts/debug/browser/debugActions
'
);
import
{
ConfigurationManager
}
from
'
vs/workbench/parts/debug/
node
/debugConfigurationManager
'
;
import
{
ConfigurationManager
}
from
'
vs/workbench/parts/debug/
electron-browser
/debugConfigurationManager
'
;
import
{
Source
}
from
'
vs/workbench/parts/debug/common/debugSource
'
;
import
{
ITaskService
,
TaskEvent
,
TaskType
,
TaskServiceEvents
,
ITaskSummary
}
from
'
vs/workbench/parts/tasks/common/taskService
'
;
import
{
TaskError
,
TaskErrors
}
from
'
vs/workbench/parts/tasks/common/taskSystem
'
;
...
...
src/vs/workbench/parts/lib/
node
/configVariables.ts
→
src/vs/workbench/parts/lib/
electron-browser
/configVariables.ts
浏览文件 @
dffbeac1
文件已移动
src/vs/workbench/parts/lib/
node
/systemVariables.ts
→
src/vs/workbench/parts/lib/
electron-browser
/systemVariables.ts
浏览文件 @
dffbeac1
...
...
@@ -13,19 +13,26 @@ import * as WorkbenchEditorCommon from 'vs/workbench/common/editor';
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IWorkspaceContextService
}
from
'
vs/workbench/services/workspace/common/contextService
'
;
import
{
remote
}
from
'
electron
'
;
export
class
SystemVariables
extends
AbstractSystemVariables
{
private
_workspaceRoot
:
string
;
private
_execPath
:
string
;
// Optional workspaceRoot there to be used in tests.
constructor
(
private
editorService
:
IWorkbenchEditorService
,
contextService
:
IWorkspaceContextService
,
workspaceRoot
:
URI
=
null
,
envVariables
:
{
[
key
:
string
]:
string
}
=
process
.
env
)
{
constructor
(
private
editorService
:
IWorkbenchEditorService
,
contextService
:
IWorkspaceContextService
,
workspaceRoot
:
URI
=
null
,
envVariables
:
{
[
key
:
string
]:
string
}
=
process
.
env
)
{
super
();
let
fsPath
=
''
;
if
(
workspaceRoot
||
(
contextService
&&
contextService
.
getWorkspace
()))
{
fsPath
=
workspaceRoot
?
workspaceRoot
.
fsPath
:
contextService
.
getWorkspace
().
resource
.
fsPath
;
}
this
.
_workspaceRoot
=
Paths
.
normalize
(
fsPath
,
true
);
this
.
_execPath
=
contextService
?
contextService
.
getConfiguration
().
env
.
execPath
:
null
;
this
.
_execPath
=
remote
.
process
.
execPath
;
Object
.
keys
(
envVariables
).
forEach
(
key
=>
{
this
[
`env.
${
key
}
`
]
=
envVariables
[
key
];
});
...
...
src/vs/workbench/parts/lib/test/
node
/configVariables.test.ts
→
src/vs/workbench/parts/lib/test/
electron-browser
/configVariables.test.ts
浏览文件 @
dffbeac1
...
...
@@ -7,7 +7,7 @@
import
*
as
assert
from
'
assert
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
*
as
Platform
from
'
vs/base/common/platform
'
;
import
{
ConfigVariables
}
from
'
vs/workbench/parts/lib/
node
/configVariables
'
;
import
{
ConfigVariables
}
from
'
vs/workbench/parts/lib/
electron-browser
/configVariables
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
...
...
src/vs/workbench/parts/lib/test/
node
/systemVariables.test.ts
→
src/vs/workbench/parts/lib/test/
electron-browser
/systemVariables.test.ts
浏览文件 @
dffbeac1
...
...
@@ -8,7 +8,7 @@ import * as assert from 'assert';
import
URI
from
'
vs/base/common/uri
'
;
import
*
as
Platform
from
'
vs/base/common/platform
'
;
import
{
SystemVariables
}
from
'
vs/workbench/parts/lib/
node
/systemVariables
'
;
import
{
SystemVariables
}
from
'
vs/workbench/parts/lib/
electron-browser
/systemVariables
'
;
suite
(
'
SystemVariables tests
'
,
()
=>
{
test
(
'
SystemVariables: substitute one
'
,
()
=>
{
...
...
src/vs/workbench/parts/tasks/
node
/processRunnerConfiguration.ts
→
src/vs/workbench/parts/tasks/
electron-browser
/processRunnerConfiguration.ts
浏览文件 @
dffbeac1
文件已移动
src/vs/workbench/parts/tasks/
node
/processRunnerDetector.ts
→
src/vs/workbench/parts/tasks/
electron-browser
/processRunnerDetector.ts
浏览文件 @
dffbeac1
...
...
@@ -14,7 +14,7 @@ import { LineProcess } from 'vs/base/node/processes';
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
import
{
SystemVariables
}
from
'
vs/workbench/parts/lib/
node
/systemVariables
'
;
import
{
SystemVariables
}
from
'
vs/workbench/parts/lib/
electron-browser
/systemVariables
'
;
import
{
IWorkspaceContextService
}
from
'
vs/workbench/services/workspace/common/contextService
'
;
import
*
as
FileConfig
from
'
./processRunnerConfiguration
'
;
...
...
src/vs/workbench/parts/tasks/
node
/processRunnerSystem.ts
→
src/vs/workbench/parts/tasks/
electron-browser
/processRunnerSystem.ts
浏览文件 @
dffbeac1
文件已移动
src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
浏览文件 @
dffbeac1
...
...
@@ -56,7 +56,7 @@ import { IPartService } from 'vs/workbench/services/part/common/partService';
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IWorkspaceContextService
}
from
'
vs/workbench/services/workspace/common/contextService
'
;
import
{
ConfigVariables
}
from
'
vs/workbench/parts/lib/
node
/configVariables
'
;
import
{
ConfigVariables
}
from
'
vs/workbench/parts/lib/
electron-browser
/configVariables
'
;
import
{
ITextFileService
,
EventType
}
from
'
vs/workbench/parts/files/common/files
'
;
import
{
IOutputService
,
IOutputChannelRegistry
,
Extensions
as
OutputExt
,
IOutputChannel
}
from
'
vs/workbench/parts/output/common/output
'
;
...
...
@@ -65,9 +65,9 @@ import { ITaskService, TaskServiceEvents } from 'vs/workbench/parts/tasks/common
import
{
templates
as
taskTemplates
}
from
'
vs/workbench/parts/tasks/common/taskTemplates
'
;
import
{
LanguageServiceTaskSystem
,
LanguageServiceTaskConfiguration
}
from
'
vs/workbench/parts/tasks/common/languageServiceTaskSystem
'
;
import
*
as
FileConfig
from
'
vs/workbench/parts/tasks/
node
/processRunnerConfiguration
'
;
import
{
ProcessRunnerSystem
}
from
'
vs/workbench/parts/tasks/
node
/processRunnerSystem
'
;
import
{
ProcessRunnerDetector
}
from
'
vs/workbench/parts/tasks/
node
/processRunnerDetector
'
;
import
*
as
FileConfig
from
'
vs/workbench/parts/tasks/
electron-browser
/processRunnerConfiguration
'
;
import
{
ProcessRunnerSystem
}
from
'
vs/workbench/parts/tasks/
electron-browser
/processRunnerSystem
'
;
import
{
ProcessRunnerDetector
}
from
'
vs/workbench/parts/tasks/
electron-browser
/processRunnerDetector
'
;
let
$
=
Builder
.
$
;
...
...
src/vs/workbench/parts/tasks/test/
node
/configuration.test.ts
→
src/vs/workbench/parts/tasks/test/
electron-browser
/configuration.test.ts
浏览文件 @
dffbeac1
...
...
@@ -11,7 +11,7 @@ import * as Platform from 'vs/base/common/platform';
import
{
ProblemMatcher
,
FileLocationKind
,
ProblemPattern
,
ApplyToKind
}
from
'
vs/platform/markers/common/problemMatcher
'
;
import
*
as
TaskSystem
from
'
vs/workbench/parts/tasks/common/taskSystem
'
;
import
{
parse
,
ParseResult
,
ILogger
,
ExternalTaskRunnerConfiguration
}
from
'
vs/workbench/parts/tasks/
node
/processRunnerConfiguration
'
;
import
{
parse
,
ParseResult
,
ILogger
,
ExternalTaskRunnerConfiguration
}
from
'
vs/workbench/parts/tasks/
electron-browser
/processRunnerConfiguration
'
;
class
Logger
implements
ILogger
{
public
receivedMessage
:
boolean
=
false
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录