Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
37c163a1
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,发现更多精彩内容 >>
提交
37c163a1
编写于
10月 01, 2015
作者:
D
Dustin Campbell
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Unify completion commit characters between C# and VB
上级
baf1380c
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
9 addition
and
22 deletion
+9
-22
src/Features/CSharp/Portable/Completion/CSharpCompletionRules.cs
...tures/CSharp/Portable/Completion/CSharpCompletionRules.cs
+0
-14
src/Features/Core/Portable/Completion/CompletionRules.cs
src/Features/Core/Portable/Completion/CompletionRules.cs
+9
-1
src/Features/VisualBasic/Portable/Completion/VisualBasicCompletionRules.vb
...alBasic/Portable/Completion/VisualBasicCompletionRules.vb
+0
-7
未找到文件。
src/Features/CSharp/Portable/Completion/CSharpCompletionRules.cs
浏览文件 @
37c163a1
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
using
Microsoft.CodeAnalysis.Completion
;
using
Microsoft.CodeAnalysis.Completion
;
using
Microsoft.CodeAnalysis.Options
;
using
Microsoft.CodeAnalysis.Options
;
using
Microsoft.CodeAnalysis.Shared.Extensions
;
namespace
Microsoft.CodeAnalysis.CSharp.Completion
namespace
Microsoft.CodeAnalysis.CSharp.Completion
{
{
...
@@ -13,19 +12,6 @@ public CSharpCompletionRules(AbstractCompletionService completionService)
...
@@ -13,19 +12,6 @@ public CSharpCompletionRules(AbstractCompletionService completionService)
{
{
}
}
protected
override
bool
IsCommitCharacterCore
(
CompletionItem
completionItem
,
char
ch
,
string
textTypedSoFar
)
{
// TODO(cyrusn): Don't hardcode this in. Suck this out of the user options.
var
commitCharacters
=
new
[]
{
' '
,
'{'
,
'}'
,
'['
,
']'
,
'('
,
')'
,
'.'
,
','
,
':'
,
';'
,
'+'
,
'-'
,
'*'
,
'/'
,
'%'
,
'&'
,
'|'
,
'^'
,
'!'
,
'~'
,
'='
,
'<'
,
'>'
,
'?'
,
'@'
,
'#'
,
'\''
,
'\"'
,
'\\'
};
return
commitCharacters
.
Contains
(
ch
);
}
protected
override
bool
SendEnterThroughToEditorCore
(
CompletionItem
completionItem
,
string
textTypedSoFar
,
OptionSet
options
)
protected
override
bool
SendEnterThroughToEditorCore
(
CompletionItem
completionItem
,
string
textTypedSoFar
,
OptionSet
options
)
{
{
// If the text doesn't match, no reason to even check the options
// If the text doesn't match, no reason to even check the options
...
...
src/Features/Core/Portable/Completion/CompletionRules.cs
浏览文件 @
37c163a1
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
using
System.Collections.Generic
;
using
System.Collections.Generic
;
using
Microsoft.CodeAnalysis.Options
;
using
Microsoft.CodeAnalysis.Options
;
using
Microsoft.CodeAnalysis.Shared.Extensions
;
using
Microsoft.CodeAnalysis.Shared.Utilities
;
using
Microsoft.CodeAnalysis.Shared.Utilities
;
using
Microsoft.CodeAnalysis.Text
;
using
Microsoft.CodeAnalysis.Text
;
...
@@ -9,6 +10,13 @@ namespace Microsoft.CodeAnalysis.Completion
...
@@ -9,6 +10,13 @@ namespace Microsoft.CodeAnalysis.Completion
{
{
internal
class
CompletionRules
internal
class
CompletionRules
{
{
private
readonly
static
char
[]
s_defaultCommitCharacters
=
new
[]
{
' '
,
'{'
,
'}'
,
'['
,
']'
,
'('
,
')'
,
'.'
,
','
,
':'
,
';'
,
'+'
,
'-'
,
'*'
,
'/'
,
'%'
,
'&'
,
'|'
,
'^'
,
'!'
,
'~'
,
'='
,
'<'
,
'>'
,
'?'
,
'@'
,
'#'
,
'\''
,
'\"'
,
'\\'
};
private
readonly
object
_gate
=
new
object
();
private
readonly
object
_gate
=
new
object
();
private
readonly
AbstractCompletionService
_completionService
;
private
readonly
AbstractCompletionService
_completionService
;
private
readonly
Dictionary
<
string
,
PatternMatcher
>
_patternMatcherMap
=
new
Dictionary
<
string
,
PatternMatcher
>();
private
readonly
Dictionary
<
string
,
PatternMatcher
>
_patternMatcherMap
=
new
Dictionary
<
string
,
PatternMatcher
>();
...
@@ -180,7 +188,7 @@ public TextChange GetTextChange(CompletionItem selectedItem, char? ch = null, st
...
@@ -180,7 +188,7 @@ public TextChange GetTextChange(CompletionItem selectedItem, char? ch = null, st
protected
virtual
bool
IsCommitCharacterCore
(
CompletionItem
completionItem
,
char
ch
,
string
textTypedSoFar
)
protected
virtual
bool
IsCommitCharacterCore
(
CompletionItem
completionItem
,
char
ch
,
string
textTypedSoFar
)
{
{
return
false
;
return
s_defaultCommitCharacters
.
Contains
(
ch
)
;
}
}
/// <summary>
/// <summary>
...
...
src/Features/VisualBasic/Portable/Completion/VisualBasicCompletionRules.vb
浏览文件 @
37c163a1
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
Imports
Microsoft.CodeAnalysis.Completion
Imports
Microsoft.CodeAnalysis.Completion
Imports
Microsoft.CodeAnalysis.Completion.Providers
Imports
Microsoft.CodeAnalysis.Completion.Providers
Imports
Microsoft.CodeAnalysis.Options
Imports
Microsoft.CodeAnalysis.Options
Imports
Microsoft.CodeAnalysis.Text
Imports
Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
Imports
Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
Namespace
Microsoft.CodeAnalysis.VisualBasic.Completion
Namespace
Microsoft.CodeAnalysis.VisualBasic.Completion
...
@@ -11,8 +10,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion
...
@@ -11,8 +10,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion
Private
NotInheritable
Class
VisualBasicCompletionRules
Private
NotInheritable
Class
VisualBasicCompletionRules
Inherits
CompletionRules
Inherits
CompletionRules
Private
ReadOnly
s_commitChars
As
Char
()
=
{
" "
c
,
";"
c
,
"("
c
,
")"
c
,
"["
c
,
"]"
c
,
"{"
c
,
"}"
c
,
"."
c
,
","
c
,
":"
c
,
"+"
c
,
"-"
c
,
"*"
c
,
"/"
c
,
"\"
c
,
"^"
c
,
"<"
c
,
">"
c
,
"'"
c
,
"="
c
,
"?"
c
}
Public
Sub
New
(
service
As
AbstractCompletionService
)
Public
Sub
New
(
service
As
AbstractCompletionService
)
MyBase
.
New
(
service
)
MyBase
.
New
(
service
)
End
Sub
End
Sub
...
@@ -138,10 +135,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion
...
@@ -138,10 +135,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion
(
item1
.
Glyph
.
Value
=
item2
.
Glyph
.
Value
)
(
item1
.
Glyph
.
Value
=
item2
.
Glyph
.
Value
)
End
Function
End
Function
Protected
Overrides
Function
IsCommitCharacterCore
(
completionItem
As
CompletionItem
,
ch
As
Char
,
textTypedSoFar
As
String
)
As
Boolean
Return
s_commitChars
.
Contains
(
ch
)
End
Function
Protected
Overrides
Function
SendEnterThroughToEditorCore
(
completionItem
As
CompletionItem
,
textTypedSoFar
As
String
,
options
As
OptionSet
)
As
Boolean
Protected
Overrides
Function
SendEnterThroughToEditorCore
(
completionItem
As
CompletionItem
,
textTypedSoFar
As
String
,
options
As
OptionSet
)
As
Boolean
' In VB we always send enter through to the editor.
' In VB we always send enter through to the editor.
Return
True
Return
True
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录