Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
2826c031
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,发现更多精彩内容 >>
提交
2826c031
编写于
6月 02, 2016
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'completionRefactor' into disableNewCompletionFeatures
上级
b5012e8b
794d7fd7
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
20 addition
and
21 deletion
+20
-21
src/EditorFeatures/Core/EditorFeatures.csproj
src/EditorFeatures/Core/EditorFeatures.csproj
+1
-1
src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/IVisualStudioCompletionSet.cs
...nse/Completion/Presentation/IVisualStudioCompletionSet.cs
+1
-1
src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/Roslyn14CompletionSet.cs
...lliSense/Completion/Presentation/Roslyn14CompletionSet.cs
+2
-2
src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/VisualStudio14CompletionSet.cs
...se/Completion/Presentation/VisualStudio14CompletionSet.cs
+7
-7
src/EditorFeatures/Next/EditorFeatures.Next.csproj
src/EditorFeatures/Next/EditorFeatures.Next.csproj
+0
-1
src/EditorFeatures/Next/IntelliSense/Completion/Presentation/Roslyn15CompletionSet.cs
...lliSense/Completion/Presentation/Roslyn15CompletionSet.cs
+1
-1
src/EditorFeatures/Next/IntelliSense/Completion/Presentation/VisualStudio15CompletionSet.cs
...se/Completion/Presentation/VisualStudio15CompletionSet.cs
+8
-8
未找到文件。
src/EditorFeatures/Core/EditorFeatures.csproj
浏览文件 @
2826c031
...
@@ -274,7 +274,7 @@
...
@@ -274,7 +274,7 @@
<Compile
Include=
"Implementation\Intellisense\Completion\OptionSetExtensions.cs"
/>
<Compile
Include=
"Implementation\Intellisense\Completion\OptionSetExtensions.cs"
/>
<Compile
Include=
"Implementation\Intellisense\Completion\Presentation\ClassificationTags.cs"
/>
<Compile
Include=
"Implementation\Intellisense\Completion\Presentation\ClassificationTags.cs"
/>
<Compile
Include=
"Implementation\Intellisense\Completion\Presentation\ImageMonikers.cs"
/>
<Compile
Include=
"Implementation\Intellisense\Completion\Presentation\ImageMonikers.cs"
/>
<Compile
Include=
"Implementation\Intellisense\Completion\Presentation\IV
s
CompletionSet.cs"
/>
<Compile
Include=
"Implementation\Intellisense\Completion\Presentation\IV
isualStudio
CompletionSet.cs"
/>
<Compile
Include=
"Implementation\Intellisense\Completion\Presentation\Roslyn14CompletionSet.cs"
/>
<Compile
Include=
"Implementation\Intellisense\Completion\Presentation\Roslyn14CompletionSet.cs"
/>
<Compile
Include=
"Implementation\Intellisense\Completion\Presentation\VisualStudio14CompletionSet.cs"
/>
<Compile
Include=
"Implementation\Intellisense\Completion\Presentation\VisualStudio14CompletionSet.cs"
/>
<Compile
Include=
"Implementation\Intellisense\Completion\SimplePresentationItem.cs"
/>
<Compile
Include=
"Implementation\Intellisense\Completion\SimplePresentationItem.cs"
/>
...
...
src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/IV
s
CompletionSet.cs
→
src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/IV
isualStudio
CompletionSet.cs
浏览文件 @
2826c031
...
@@ -13,7 +13,7 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.Completion.P
...
@@ -13,7 +13,7 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.Completion.P
/// us to encapulate logic in our own inheritance hierarchy without having to fit into the
/// us to encapulate logic in our own inheritance hierarchy without having to fit into the
/// editor's inheritance hierarchy.
/// editor's inheritance hierarchy.
/// </summary>
/// </summary>
internal
interface
IV
s
CompletionSet
:
ICompletionSet
internal
interface
IV
isualStudio
CompletionSet
:
ICompletionSet
{
{
string
DisplayName
{
get
;
set
;
}
string
DisplayName
{
get
;
set
;
}
string
Moniker
{
get
;
set
;
}
string
Moniker
{
get
;
set
;
}
...
...
src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/Roslyn14CompletionSet.cs
浏览文件 @
2826c031
...
@@ -26,7 +26,7 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.Completion.P
...
@@ -26,7 +26,7 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.Completion.P
/// </summary>
/// </summary>
internal
class
Roslyn14CompletionSet
:
ForegroundThreadAffinitizedObject
internal
class
Roslyn14CompletionSet
:
ForegroundThreadAffinitizedObject
{
{
protected
readonly
IV
s
CompletionSet
VsCompletionSet
;
protected
readonly
IV
isualStudio
CompletionSet
VsCompletionSet
;
private
readonly
ITextView
_textView
;
private
readonly
ITextView
_textView
;
...
@@ -37,7 +37,7 @@ internal class Roslyn14CompletionSet : ForegroundThreadAffinitizedObject
...
@@ -37,7 +37,7 @@ internal class Roslyn14CompletionSet : ForegroundThreadAffinitizedObject
protected
IReadOnlyDictionary
<
CompletionItem
,
string
>
CompletionItemToFilterText
;
protected
IReadOnlyDictionary
<
CompletionItem
,
string
>
CompletionItemToFilterText
;
public
Roslyn14CompletionSet
(
public
Roslyn14CompletionSet
(
IV
s
CompletionSet
vsCompletionSet
,
IV
isualStudio
CompletionSet
vsCompletionSet
,
CompletionPresenterSession
completionPresenterSession
,
CompletionPresenterSession
completionPresenterSession
,
ITextView
textView
,
ITextView
textView
,
ITextBuffer
subjectBuffer
)
ITextBuffer
subjectBuffer
)
...
...
src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/VisualStudio14CompletionSet.cs
浏览文件 @
2826c031
...
@@ -12,7 +12,7 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.Completion.P
...
@@ -12,7 +12,7 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.Completion.P
/// See comment on VisualStudio15CompletionSet for an explanation of how these types
/// See comment on VisualStudio15CompletionSet for an explanation of how these types
/// fit together and where code should go in them.
/// fit together and where code should go in them.
/// </summary>
/// </summary>
internal
class
VisualStudio14CompletionSet
:
CompletionSet
,
IV
s
CompletionSet
internal
class
VisualStudio14CompletionSet
:
CompletionSet
,
IV
isualStudio
CompletionSet
{
{
private
readonly
Roslyn14CompletionSet
_roslynCompletionSet
;
private
readonly
Roslyn14CompletionSet
_roslynCompletionSet
;
...
@@ -65,31 +65,31 @@ PresentationItem ICompletionSet.GetPresentationItem(VSCompletion completion)
...
@@ -65,31 +65,31 @@ PresentationItem ICompletionSet.GetPresentationItem(VSCompletion completion)
#
region
IVsCompletionSet
-
Forward
to
base
type
.
#
region
IVsCompletionSet
-
Forward
to
base
type
.
string
IV
s
CompletionSet
.
DisplayName
string
IV
isualStudio
CompletionSet
.
DisplayName
{
{
get
{
return
base
.
DisplayName
;
}
get
{
return
base
.
DisplayName
;
}
set
{
base
.
DisplayName
=
value
;
}
set
{
base
.
DisplayName
=
value
;
}
}
}
string
IV
s
CompletionSet
.
Moniker
string
IV
isualStudio
CompletionSet
.
Moniker
{
{
get
{
return
base
.
Moniker
;
}
get
{
return
base
.
Moniker
;
}
set
{
base
.
Moniker
=
value
;
}
set
{
base
.
Moniker
=
value
;
}
}
}
ITrackingSpan
IV
s
CompletionSet
.
ApplicableTo
ITrackingSpan
IV
isualStudio
CompletionSet
.
ApplicableTo
{
{
get
{
return
base
.
ApplicableTo
;
}
get
{
return
base
.
ApplicableTo
;
}
set
{
base
.
ApplicableTo
=
value
;
}
set
{
base
.
ApplicableTo
=
value
;
}
}
}
BulkObservableCollection
<
VSCompletion
>
IV
s
CompletionSet
.
WritableCompletionBuilders
=>
BulkObservableCollection
<
VSCompletion
>
IV
isualStudio
CompletionSet
.
WritableCompletionBuilders
=>
base
.
WritableCompletionBuilders
;
base
.
WritableCompletionBuilders
;
BulkObservableCollection
<
VSCompletion
>
IV
s
CompletionSet
.
WritableCompletions
=>
BulkObservableCollection
<
VSCompletion
>
IV
isualStudio
CompletionSet
.
WritableCompletions
=>
base
.
WritableCompletions
;
base
.
WritableCompletions
;
CompletionSelectionStatus
IV
s
CompletionSet
.
SelectionStatus
CompletionSelectionStatus
IV
isualStudio
CompletionSet
.
SelectionStatus
{
{
get
{
return
base
.
SelectionStatus
;
}
get
{
return
base
.
SelectionStatus
;
}
set
{
base
.
SelectionStatus
=
value
;
}
set
{
base
.
SelectionStatus
=
value
;
}
...
...
src/EditorFeatures/Next/EditorFeatures.Next.csproj
浏览文件 @
2826c031
...
@@ -15,7 +15,6 @@
...
@@ -15,7 +15,6 @@
<AssemblyName>
Microsoft.CodeAnalysis.EditorFeatures.Next
</AssemblyName>
<AssemblyName>
Microsoft.CodeAnalysis.EditorFeatures.Next
</AssemblyName>
<TargetFrameworkVersion>
v4.6
</TargetFrameworkVersion>
<TargetFrameworkVersion>
v4.6
</TargetFrameworkVersion>
<CopyNuGetImplementations>
false
</CopyNuGetImplementations>
<CopyNuGetImplementations>
false
</CopyNuGetImplementations>
<DefineConstants>
DEV15
</DefineConstants>
</PropertyGroup>
</PropertyGroup>
<ItemGroup
Label=
"Project References"
>
<ItemGroup
Label=
"Project References"
>
<ProjectReference
Include=
"..\..\Compilers\Core\Portable\CodeAnalysis.csproj"
>
<ProjectReference
Include=
"..\..\Compilers\Core\Portable\CodeAnalysis.csproj"
>
...
...
src/EditorFeatures/Next/IntelliSense/Completion/Presentation/Roslyn15CompletionSet.cs
浏览文件 @
2826c031
...
@@ -25,7 +25,7 @@ internal class Roslyn15CompletionSet : Roslyn14CompletionSet
...
@@ -25,7 +25,7 @@ internal class Roslyn15CompletionSet : Roslyn14CompletionSet
public
IReadOnlyList
<
IntellisenseFilter2
>
Filters
;
public
IReadOnlyList
<
IntellisenseFilter2
>
Filters
;
public
Roslyn15CompletionSet
(
public
Roslyn15CompletionSet
(
IV
s
CompletionSet
vsCompletionSet
,
IV
isualStudio
CompletionSet
vsCompletionSet
,
CompletionPresenterSession
completionPresenterSession
,
CompletionPresenterSession
completionPresenterSession
,
ITextView
textView
,
ITextView
textView
,
ITextBuffer
subjectBuffer
)
ITextBuffer
subjectBuffer
)
...
...
src/EditorFeatures/Next/IntelliSense/Completion/Presentation/VisualStudio15CompletionSet.cs
浏览文件 @
2826c031
...
@@ -29,9 +29,9 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.Completion.P
...
@@ -29,9 +29,9 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.Completion.P
/// Important! Do not put any actual logic into this type. Instead, forward any work to
/// Important! Do not put any actual logic into this type. Instead, forward any work to
/// <see cref="VisualStudio15CompletionSet._roslynCompletionSet"/>. If that code then
/// <see cref="VisualStudio15CompletionSet._roslynCompletionSet"/>. If that code then
/// needs information from this <see cref="CompletionSet2"/> then expose that data through
/// needs information from this <see cref="CompletionSet2"/> then expose that data through
/// the <see cref="IV
s
CompletionSet"/> interface.
/// the <see cref="IV
isualStudio
CompletionSet"/> interface.
/// </summary>
/// </summary>
internal
class
VisualStudio15CompletionSet
:
CompletionSet2
,
IV
s
CompletionSet
internal
class
VisualStudio15CompletionSet
:
CompletionSet2
,
IV
isualStudio
CompletionSet
{
{
private
readonly
Roslyn15CompletionSet
_roslynCompletionSet
;
private
readonly
Roslyn15CompletionSet
_roslynCompletionSet
;
...
@@ -95,31 +95,31 @@ PresentationItem ICompletionSet.GetPresentationItem(VSCompletion completion)
...
@@ -95,31 +95,31 @@ PresentationItem ICompletionSet.GetPresentationItem(VSCompletion completion)
// not settable except through the subclass. Here we essentially make those properties
// not settable except through the subclass. Here we essentially make those properties
// available so that Roslyn15CompletionSet and Roslyn14CompletionSet can read/write them.
// available so that Roslyn15CompletionSet and Roslyn14CompletionSet can read/write them.
string
IV
s
CompletionSet
.
DisplayName
string
IV
isualStudio
CompletionSet
.
DisplayName
{
{
get
{
return
base
.
DisplayName
;
}
get
{
return
base
.
DisplayName
;
}
set
{
base
.
DisplayName
=
value
;
}
set
{
base
.
DisplayName
=
value
;
}
}
}
string
IV
s
CompletionSet
.
Moniker
string
IV
isualStudio
CompletionSet
.
Moniker
{
{
get
{
return
base
.
Moniker
;
}
get
{
return
base
.
Moniker
;
}
set
{
base
.
Moniker
=
value
;
}
set
{
base
.
Moniker
=
value
;
}
}
}
ITrackingSpan
IV
s
CompletionSet
.
ApplicableTo
ITrackingSpan
IV
isualStudio
CompletionSet
.
ApplicableTo
{
{
get
{
return
base
.
ApplicableTo
;
}
get
{
return
base
.
ApplicableTo
;
}
set
{
base
.
ApplicableTo
=
value
;
}
set
{
base
.
ApplicableTo
=
value
;
}
}
}
BulkObservableCollection
<
VSCompletion
>
IV
s
CompletionSet
.
WritableCompletionBuilders
=>
BulkObservableCollection
<
VSCompletion
>
IV
isualStudio
CompletionSet
.
WritableCompletionBuilders
=>
base
.
WritableCompletionBuilders
;
base
.
WritableCompletionBuilders
;
BulkObservableCollection
<
VSCompletion
>
IV
s
CompletionSet
.
WritableCompletions
=>
BulkObservableCollection
<
VSCompletion
>
IV
isualStudio
CompletionSet
.
WritableCompletions
=>
base
.
WritableCompletions
;
base
.
WritableCompletions
;
CompletionSelectionStatus
IV
s
CompletionSet
.
SelectionStatus
CompletionSelectionStatus
IV
isualStudio
CompletionSet
.
SelectionStatus
{
{
get
{
return
base
.
SelectionStatus
;
}
get
{
return
base
.
SelectionStatus
;
}
set
{
base
.
SelectionStatus
=
value
;
}
set
{
base
.
SelectionStatus
=
value
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录