Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
4cc84900
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,发现更多精彩内容 >>
未验证
提交
4cc84900
编写于
12月 22, 2017
作者:
I
Isidor Nikolic
提交者:
GitHub
12月 22, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #39483 from yitongding/addSelectedText
Add selected text to configuration variable #27466
上级
3971678b
42829509
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
24 addition
and
1 deletion
+24
-1
src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
...Resolver/electron-browser/configurationResolverService.ts
+16
-0
src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
...est/electron-browser/configurationResolverService.test.ts
+4
-0
src/vs/workbench/test/workbenchTestServices.ts
src/vs/workbench/test/workbenchTestServices.ts
+4
-1
未找到文件。
src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
浏览文件 @
4cc84900
...
...
@@ -103,6 +103,22 @@ export class ConfigurationResolverService implements IConfigurationResolverServi
return
''
;
}
private
get
selectedText
():
string
{
const
activeEditor
=
this
.
editorService
.
getActiveEditor
();
if
(
activeEditor
)
{
const
editorControl
=
(
<
ICodeEditor
>
activeEditor
.
getControl
());
if
(
editorControl
)
{
const
editorModel
=
editorControl
.
getModel
();
const
editorSelection
=
editorControl
.
getSelection
();
if
(
editorModel
&&
editorSelection
)
{
return
editorModel
.
getValueInRange
(
editorSelection
);
}
}
}
return
''
;
}
private
getFilePath
():
string
{
let
input
=
this
.
editorService
.
getActiveEditorInput
();
if
(
input
instanceof
DiffEditorInput
)
{
...
...
src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts
浏览文件 @
4cc84900
...
...
@@ -56,6 +56,10 @@ suite('Configuration Resolver Service', () => {
assert
.
strictEqual
(
configurationResolverService
.
resolve
(
workspace
,
'
abc ${lineNumber} xyz
'
),
`abc
${
editorService
.
mockLineNumber
}
xyz`
);
});
test
(
'
current selected text
'
,
()
=>
{
assert
.
strictEqual
(
configurationResolverService
.
resolve
(
workspace
,
'
abc ${selectedText} xyz
'
),
`abc
${
editorService
.
mockSelectedText
}
xyz`
);
});
test
(
'
substitute many
'
,
()
=>
{
if
(
platform
.
isWindows
)
{
assert
.
strictEqual
(
configurationResolverService
.
resolve
(
workspace
,
'
${workspaceFolder} - ${workspaceFolder}
'
),
'
\\
VSCode
\\
workspaceLocation -
\\
VSCode
\\
workspaceLocation
'
);
...
...
src/vs/workbench/test/workbenchTestServices.ts
浏览文件 @
4cc84900
...
...
@@ -584,12 +584,14 @@ export class TestEditorService implements IWorkbenchEditorService {
public
activeEditorOptions
:
IEditorOptions
;
public
activeEditorPosition
:
Position
;
public
mockLineNumber
:
number
;
public
mockSelectedText
:
string
;
private
callback
:
(
method
:
string
)
=>
void
;
constructor
(
callback
?:
(
method
:
string
)
=>
void
)
{
this
.
callback
=
callback
||
((
s
:
string
)
=>
{
});
this
.
mockLineNumber
=
15
;
this
.
mockSelectedText
=
'
selected text
'
;
}
public
openEditors
(
inputs
:
any
[]):
Promise
{
...
...
@@ -618,7 +620,8 @@ export class TestEditorService implements IWorkbenchEditorService {
getId
:
()
=>
{
return
null
;
},
getControl
:
()
=>
{
return
{
getSelection
:
()
=>
{
return
{
positionLineNumber
:
this
.
mockLineNumber
};
}
getSelection
:
()
=>
{
return
{
positionLineNumber
:
this
.
mockLineNumber
};
},
getModel
:
()
=>
{
return
{
getValueInRange
:
()
=>
this
.
mockSelectedText
};
}
};
},
focus
:
()
=>
{
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录