Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
8ff5d6d2
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8ff5d6d2
编写于
3月 02, 2020
作者:
D
David Barbet
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Disable unimported types completion in liveshare until we have support in the LSP client.
上级
8c0c2126
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
36 addition
and
1 deletion
+36
-1
src/Features/LanguageServer/Protocol/Handler/Completion/CompletionHandler.cs
...geServer/Protocol/Handler/Completion/CompletionHandler.cs
+11
-1
src/Features/LanguageServer/ProtocolUnitTests/Completion/CompletionTests.cs
...ageServer/ProtocolUnitTests/Completion/CompletionTests.cs
+25
-0
未找到文件。
src/Features/LanguageServer/Protocol/Handler/Completion/CompletionHandler.cs
浏览文件 @
8ff5d6d2
...
...
@@ -11,6 +11,7 @@
using
Microsoft.CodeAnalysis.Completion
;
using
Microsoft.CodeAnalysis.Editor.Shared.Extensions
;
using
Microsoft.CodeAnalysis.LanguageServer.CustomProtocol
;
using
Microsoft.CodeAnalysis.Options
;
using
Microsoft.VisualStudio.Text.Adornments
;
using
LSP
=
Microsoft
.
VisualStudio
.
LanguageServer
.
Protocol
;
...
...
@@ -34,14 +35,23 @@ internal class CompletionHandler : IRequestHandler<LSP.CompletionParams, object>
var
position
=
await
document
.
GetPositionFromLinePositionAsync
(
ProtocolConversions
.
PositionToLinePosition
(
request
.
Position
),
cancellationToken
).
ConfigureAwait
(
false
);
// Filter out unimported types for now as there are two issues with providing them:
// 1. LSP client does not currently provide a way to provide detail text on the completion item to show the namespace.
// https://dev.azure.com/devdiv/DevDiv/_workitems/edit/1076759
// 2. We need to figure out how to provide the text edits along with the completion item or provide them in the resolve request.
// https://devdiv.visualstudio.com/DevDiv/_workitems/edit/985860/
var
documentOptions
=
await
document
.
GetOptionsAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
var
completionOptions
=
documentOptions
.
WithChangedOption
(
CompletionServiceOptions
.
IsExpandedCompletion
,
false
);
var
completionService
=
document
.
Project
.
LanguageServices
.
GetService
<
CompletionService
>();
var
list
=
await
completionService
.
GetCompletionsAsync
(
document
,
position
,
cancellationToken
:
cancellationToken
).
ConfigureAwait
(
false
);
var
list
=
await
completionService
.
GetCompletionsAsync
(
document
,
position
,
options
:
completionOptions
,
cancellationToken
:
cancellationToken
).
ConfigureAwait
(
false
);
if
(
list
==
null
)
{
return
Array
.
Empty
<
LSP
.
CompletionItem
>();
}
var
lspVSClientCapability
=
clientCapabilities
?.
HasVisualStudioLspCapability
()
==
true
;
return
list
.
Items
.
Select
(
item
=>
CreateLSPCompletionItem
(
request
,
item
,
lspVSClientCapability
)).
ToArray
();
// local functions
...
...
src/Features/LanguageServer/ProtocolUnitTests/Completion/CompletionTests.cs
浏览文件 @
8ff5d6d2
...
...
@@ -5,6 +5,7 @@
using
System.Linq
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.Completion
;
using
Roslyn.Test.Utilities
;
using
Xunit
;
using
LSP
=
Microsoft
.
VisualStudio
.
LanguageServer
.
Protocol
;
...
...
@@ -32,6 +33,30 @@ void M()
AssertJsonEquals
(
expected
,
results
.
First
());
}
[
Fact
]
public
async
Task
TestGetCompletionsDoesNotIncludeUnimportedTypesAsync
()
{
var
markup
=
@"class A
{
void M()
{
{|caret:|}
}
}"
;
var
(
solution
,
locations
)
=
CreateTestSolution
(
markup
);
// Make sure the unimported types option is on by default.
solution
=
solution
.
WithOptions
(
solution
.
Options
.
WithChangedOption
(
CompletionServiceOptions
.
IsExpandedCompletion
,
true
));
var
expected
=
CreateCompletionItem
(
"A"
,
LSP
.
CompletionItemKind
.
Class
,
new
string
[]
{
"Class"
,
"Internal"
},
CreateCompletionParams
(
locations
[
"caret"
].
Single
()));
var
clientCapabilities
=
new
LSP
.
VSClientCapabilities
{
SupportsVisualStudioExtensions
=
true
};
var
results
=
(
LSP
.
CompletionItem
[])
await
RunGetCompletionsAsync
(
solution
,
locations
[
"caret"
].
Single
(),
clientCapabilities
);
Assert
.
False
(
results
.
Any
(
item
=>
"Console"
==
item
.
Label
));
}
private
static
async
Task
<
object
>
RunGetCompletionsAsync
(
Solution
solution
,
LSP
.
Location
caret
,
LSP
.
ClientCapabilities
clientCapabilities
=
null
)
=>
await
GetLanguageServer
(
solution
).
GetCompletionsAsync
(
solution
,
CreateCompletionParams
(
caret
),
clientCapabilities
,
CancellationToken
.
None
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录