Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a33f2a23
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,发现更多精彩内容 >>
提交
a33f2a23
编写于
2月 15, 2017
作者:
I
Isidor Nikolic
提交者:
GitHub
2月 15, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #20660 from michelkaporin/lineNumber-configuration
Line number configuration fixes #12714
上级
003b2ebf
98591f11
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
31 addition
and
1 deletion
+31
-1
src/vs/workbench/services/configurationResolver/node/configurationResolverService.ts
...onfigurationResolver/node/configurationResolverService.ts
+14
-0
src/vs/workbench/services/configurationResolver/test/node/configurationResolverService.test.ts
...onResolver/test/node/configurationResolverService.test.ts
+4
-0
src/vs/workbench/test/workbenchTestServices.ts
src/vs/workbench/test/workbenchTestServices.ts
+13
-1
未找到文件。
src/vs/workbench/services/configurationResolver/node/configurationResolverService.ts
浏览文件 @
a33f2a23
...
...
@@ -13,6 +13,7 @@ import { IConfigurationResolverService } from 'vs/workbench/services/configurati
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
ICommandService
}
from
'
vs/platform/commands/common/commands
'
;
import
{
ICommonCodeEditor
}
from
'
vs/editor/common/editorCommon
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
toResource
}
from
'
vs/workbench/common/editor
'
;
...
...
@@ -77,6 +78,19 @@ export class ConfigurationResolverService implements IConfigurationResolverServi
return
paths
.
extname
(
this
.
getFilePath
());
}
private
get
lineNumber
():
string
{
const
activeEditor
=
this
.
editorService
.
getActiveEditor
();
if
(
activeEditor
)
{
const
editorControl
=
(
<
ICommonCodeEditor
>
activeEditor
.
getControl
());
if
(
editorControl
)
{
const
lineNumber
=
editorControl
.
getSelection
().
positionLineNumber
;
return
String
(
lineNumber
);
}
}
return
''
;
}
private
getFilePath
():
string
{
let
input
=
this
.
editorService
.
getActiveEditorInput
();
if
(
!
input
)
{
...
...
src/vs/workbench/services/configurationResolver/test/node/configurationResolverService.test.ts
浏览文件 @
a33f2a23
...
...
@@ -41,6 +41,10 @@ suite('Configuration Resolver Service', () => {
assert
.
strictEqual
(
configurationResolverService
.
resolve
(
'
abc ${workspaceRootFolderName} xyz
'
),
'
abc workspaceLocation xyz
'
);
});
test
(
'
current selected line number
'
,
()
=>
{
assert
.
strictEqual
(
configurationResolverService
.
resolve
(
'
abc ${lineNumber} xyz
'
),
'
abc 15 xyz
'
);
});
test
(
'
substitute many
'
,
()
=>
{
if
(
platform
.
isWindows
)
{
assert
.
strictEqual
(
configurationResolverService
.
resolve
(
'
${workspaceRoot} - ${workspaceRoot}
'
),
'
\\
VSCode
\\
workspaceLocation -
\\
VSCode
\\
workspaceLocation
'
);
...
...
src/vs/workbench/test/workbenchTestServices.ts
浏览文件 @
a33f2a23
...
...
@@ -498,7 +498,19 @@ export class TestEditorService implements IWorkbenchEditorService {
public
getActiveEditor
():
IEditor
{
this
.
callback
(
'
getActiveEditor
'
);
return
null
;
return
{
input
:
null
,
options
:
null
,
position
:
null
,
getId
:
()
=>
{
return
null
;
},
getControl
:
()
=>
{
return
{
getSelection
:
()
=>
{
return
{
positionLineNumber
:
15
};
}
};
},
focus
:
()
=>
{
},
isVisible
:
()
=>
{
return
true
;
}
};
}
public
getActiveEditorInput
():
IEditorInput
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录