Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
87b6d031
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
87b6d031
编写于
2月 04, 2020
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add cursor position check to jsDocCompletionTest
上级
2b7e6ab2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
42 addition
and
34 deletion
+42
-34
extensions/typescript-language-features/src/test/jsDocCompletions.test.ts
...cript-language-features/src/test/jsDocCompletions.test.ts
+20
-17
extensions/typescript-language-features/src/test/testUtils.ts
...nsions/typescript-language-features/src/test/testUtils.ts
+22
-17
未找到文件。
extensions/typescript-language-features/src/test/jsDocCompletions.test.ts
浏览文件 @
87b6d031
...
...
@@ -3,12 +3,11 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
*
as
assert
from
'
assert
'
;
import
'
mocha
'
;
import
*
as
vscode
from
'
vscode
'
;
import
{
disposeAll
}
from
'
../utils/dispose
'
;
import
{
acceptFirstSuggestion
}
from
'
./suggestTestHelpers
'
;
import
{
Config
,
createTestEditor
,
joinLines
,
updateConfig
,
VsCodeConfiguration
,
wait
}
from
'
./testUtils
'
;
import
{
assertEditorContents
,
Config
,
createTestEditor
,
CURSOR
,
enumerateConfig
,
insertModesValues
,
joinLines
,
updateConfig
,
VsCodeConfiguration
,
wait
}
from
'
./testUtils
'
;
const
testDocumentUri
=
vscode
.
Uri
.
parse
(
'
untitled:test.ts
'
);
...
...
@@ -38,21 +37,25 @@ suite('JSDoc Completions', () => {
});
test
(
'
Should complete jsdoc inside single line comment
'
,
async
()
=>
{
await
createTestEditor
(
testDocumentUri
,
`/**$0 */`
,
`function abcdef(x, y) { }`
,
);
const
document
=
await
acceptFirstSuggestion
(
testDocumentUri
,
_disposables
);
assert
.
strictEqual
(
document
.
getText
(),
joinLines
(
`/**`
,
` * `
,
` * @param x `
,
` * @param y `
,
` */`
,
await
enumerateConfig
(
testDocumentUri
,
Config
.
insertMode
,
insertModesValues
,
async
config
=>
{
const
editor
=
await
createTestEditor
(
testDocumentUri
,
`/**$0 */`
,
`function abcdef(x, y) { }`
,
));
);
await
acceptFirstSuggestion
(
testDocumentUri
,
_disposables
);
assertEditorContents
(
editor
,
joinLines
(
`/**`
,
` * `
,
` * @param x
${
CURSOR
}
`
,
` * @param y `
,
` */`
,
`function abcdef(x, y) { }`
,
),
`Config:
${
config
}
`
);
});
});
});
extensions/typescript-language-features/src/test/testUtils.ts
浏览文件 @
87b6d031
...
...
@@ -74,14 +74,9 @@ export const joinLines = (...args: string[]) => args.join('\n');
export
async
function
createTestEditor
(
uri
:
vscode
.
Uri
,
...
lines
:
string
[])
{
const
document
=
await
vscode
.
workspace
.
openTextDocument
(
uri
);
await
vscode
.
window
.
showTextDocument
(
document
);
const
activeEditor
=
vscode
.
window
.
activeTextEditor
;
if
(
!
activeEditor
)
{
throw
new
Error
(
'
no active editor
'
);
}
await
activeEditor
.
insertSnippet
(
new
vscode
.
SnippetString
(
joinLines
(...
lines
)),
new
vscode
.
Range
(
0
,
0
,
1000
,
0
));
return
activeEditor
;
const
editor
=
await
vscode
.
window
.
showTextDocument
(
document
);
await
editor
.
insertSnippet
(
new
vscode
.
SnippetString
(
joinLines
(...
lines
)),
new
vscode
.
Range
(
0
,
0
,
1000
,
0
));
return
editor
;
}
export
function
assertEditorContents
(
editor
:
vscode
.
TextEditor
,
expectedDocContent
:
string
,
message
?:
string
):
void
{
...
...
@@ -94,15 +89,11 @@ export function assertEditorContents(editor: vscode.TextEditor, expectedDocConte
if
(
cursorIndex
>=
0
)
{
const
expectedCursorPos
=
editor
.
document
.
positionAt
(
cursorIndex
);
assert
.
strictEqual
(
editor
.
selection
.
active
.
line
,
expectedCursorPos
.
line
assert
.
deepEqual
(
{
line
:
editor
.
selection
.
active
.
line
,
character
:
editor
.
selection
.
active
.
line
},
{
line
:
expectedCursorPos
.
line
,
character
:
expectedCursorPos
.
line
},
'
Cursor position
'
);
assert
.
strictEqual
(
editor
.
selection
.
active
.
character
,
expectedCursorPos
.
character
);
}
}
...
...
@@ -120,7 +111,6 @@ export async function updateConfig(documentUri: vscode.Uri, newConfig: VsCodeCon
return
oldConfig
;
}
export
const
Config
=
Object
.
freeze
({
autoClosingBrackets
:
'
editor.autoClosingBrackets
'
,
completeFunctionCalls
:
'
typescript.suggest.completeFunctionCalls
'
,
...
...
@@ -128,3 +118,18 @@ export const Config = Object.freeze({
snippetSuggestions
:
'
editor.snippetSuggestions
'
,
suggestSelection
:
'
editor.suggestSelection
'
,
}
as
const
);
export
const
insertModesValues
=
Object
.
freeze
([
'
insert
'
,
'
replace
'
]);
export
async
function
enumerateConfig
(
documentUri
:
vscode
.
Uri
,
configKey
:
string
,
values
:
readonly
string
[],
f
:
(
message
:
string
)
=>
Promise
<
void
>
):
Promise
<
void
>
{
for
(
const
value
of
values
)
{
const
newConfig
=
{
[
configKey
]:
value
};
await
updateConfig
(
documentUri
,
newConfig
);
await
f
(
JSON
.
stringify
(
newConfig
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录