Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
b7e39b62
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,发现更多精彩内容 >>
提交
b7e39b62
编写于
11月 05, 2019
作者:
I
Ivan Basov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Completion: VSMac TypeScript completion doesn't commit with Enter
上级
eac992d2
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
26 addition
and
15 deletion
+26
-15
src/EditorFeatures/Core/Implementation/IntelliSense/AsyncCompletion/CommitManager.cs
...lementation/IntelliSense/AsyncCompletion/CommitManager.cs
+2
-14
src/EditorFeatures/Core/Implementation/IntelliSense/AsyncCompletion/Helpers.cs
...re/Implementation/IntelliSense/AsyncCompletion/Helpers.cs
+24
-1
未找到文件。
src/EditorFeatures/Core/Implementation/IntelliSense/AsyncCompletion/CommitManager.cs
浏览文件 @
b7e39b62
...
...
@@ -114,8 +114,7 @@ internal CommitManager(ITextView textView, RecentItemsManager recentItemsManager
// We can be called before for ShouldCommitCompletion. However, that call does not provide rules applied for the completion item.
// Now we check for the commit charcter in the context of Rules that could change the list of commit characters.
// Tab, Enter and Null (call invoke commit) are always commit characters.
if
(
typeChar
!=
'\t'
&&
typeChar
!=
'\n'
&&
typeChar
!=
'\0'
&&
!
IsCommitCharacter
(
serviceRules
,
roslynItem
,
typeChar
,
filterText
))
if
(!
Helpers
.
IsStandardCommitCharacter
(
typeChar
)
&&
!
IsCommitCharacter
(
serviceRules
,
roslynItem
,
typeChar
,
filterText
))
{
// Returning None means we complete the current session with a void commit.
// The Editor then will try to trigger a new completion session for the character.
...
...
@@ -321,7 +320,7 @@ internal static bool IsCommitCharacter(CompletionRules completionRules, Completi
}
// general rule: if the filtering text exactly matches the start of the item then it must be a filter character
if
(
TextTypedSoFarMatchesItem
(
item
,
textTypedSoFar
))
if
(
Helpers
.
TextTypedSoFarMatchesItem
(
item
,
textTypedSoFar
))
{
return
false
;
}
...
...
@@ -330,17 +329,6 @@ internal static bool IsCommitCharacter(CompletionRules completionRules, Completi
return
completionRules
.
DefaultCommitCharacters
.
IndexOf
(
ch
)
>=
0
;
}
internal
static
bool
TextTypedSoFarMatchesItem
(
CompletionItem
item
,
string
textTypedSoFar
)
{
if
(
textTypedSoFar
.
Length
>
0
)
{
return
item
.
DisplayText
.
StartsWith
(
textTypedSoFar
,
StringComparison
.
CurrentCultureIgnoreCase
)
||
item
.
FilterText
.
StartsWith
(
textTypedSoFar
,
StringComparison
.
CurrentCultureIgnoreCase
);
}
return
false
;
}
internal
static
bool
SendEnterThroughToEditor
(
CompletionRules
rules
,
RoslynCompletionItem
item
,
string
textTypedSoFar
)
{
var
rule
=
item
.
Rules
.
EnterKeyRule
;
...
...
src/EditorFeatures/Core/Implementation/IntelliSense/AsyncCompletion/Helpers.cs
浏览文件 @
b7e39b62
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using
System
;
using
Microsoft.CodeAnalysis.Completion
;
using
Microsoft.VisualStudio.Text
;
using
EditorAsyncCompletion
=
Microsoft
.
VisualStudio
.
Language
.
Intellisense
.
AsyncCompletion
;
...
...
@@ -81,6 +82,12 @@ internal static CompletionFilterReason GetFilterReason(EditorAsyncCompletionData
internal
static
bool
IsFilterCharacter
(
RoslynCompletionItem
item
,
char
ch
,
string
textTypedSoFar
)
{
// Exclude standard commit character upfront because TextTypedSoFarMatchesItem can miss them on non-Windows platforms.
if
(
IsStandardCommitCharacter
(
ch
))
{
return
false
;
}
// First see if the item has any specific filter rules it wants followed.
foreach
(
var
rule
in
item
.
Rules
.
FilterCharacterRules
)
{
...
...
@@ -106,7 +113,7 @@ internal static bool IsFilterCharacter(RoslynCompletionItem item, char ch, strin
}
// general rule: if the filtering text exactly matches the start of the item then it must be a filter character
if
(
CommitManager
.
TextTypedSoFarMatchesItem
(
item
,
textTypedSoFar
))
if
(
TextTypedSoFarMatchesItem
(
item
,
textTypedSoFar
))
{
return
true
;
}
...
...
@@ -114,6 +121,22 @@ internal static bool IsFilterCharacter(RoslynCompletionItem item, char ch, strin
return
false
;
}
internal
static
bool
TextTypedSoFarMatchesItem
(
RoslynCompletionItem
item
,
string
textTypedSoFar
)
{
if
(
textTypedSoFar
.
Length
>
0
)
{
// Note that StartsWith ignores \0 at the end of textTypedSoFar on VS Mac and Mono.
return
item
.
DisplayText
.
StartsWith
(
textTypedSoFar
,
StringComparison
.
CurrentCultureIgnoreCase
)
||
item
.
FilterText
.
StartsWith
(
textTypedSoFar
,
StringComparison
.
CurrentCultureIgnoreCase
);
}
return
false
;
}
// Tab, Enter and Null (call invoke commit) are always commit characters.
internal
static
bool
IsStandardCommitCharacter
(
char
c
)
=>
c
==
'\t'
||
c
==
'\n'
||
c
==
'\0'
;
internal
static
bool
TryGetInitialTriggerLocation
(
EditorAsyncCompletion
.
IAsyncCompletionSession
session
,
out
SnapshotPoint
initialTriggerLocation
)
{
if
(
session
is
EditorAsyncCompletion
.
IAsyncCompletionSessionOperations
sessionOperations
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录