Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
41c49371
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,发现更多精彩内容 >>
提交
41c49371
编写于
3月 15, 2019
作者:
T
TIHan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Removed IVT fsharp, fixed build
上级
434faa27
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
71 addition
and
10 deletion
+71
-10
src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
...Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
+1
-1
src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
...es/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
+1
-2
src/Tools/ExternalAccess/FSharp/Completion/CompletionOptions.cs
...ols/ExternalAccess/FSharp/Completion/CompletionOptions.cs
+1
-1
src/Tools/ExternalAccess/FSharp/Diagnostics/DiagnosticAnalyzerService.cs
...nalAccess/FSharp/Diagnostics/DiagnosticAnalyzerService.cs
+2
-2
src/Tools/ExternalAccess/FSharp/Editor/FSharpBraceMatcher.cs
src/Tools/ExternalAccess/FSharp/Editor/FSharpBraceMatcher.cs
+34
-0
src/Tools/ExternalAccess/FSharp/Editor/IFSharpBraceMatcher.cs
...Tools/ExternalAccess/FSharp/Editor/IFSharpBraceMatcher.cs
+24
-0
src/Tools/ExternalAccess/FSharp/PublicAPI.Unshipped.txt
src/Tools/ExternalAccess/FSharp/PublicAPI.Unshipped.txt
+6
-0
src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
...o/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
+1
-2
src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj
...osoft.VisualStudio.LanguageServices.Implementation.csproj
+1
-2
未找到文件。
src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
浏览文件 @
41c49371
...
...
@@ -47,7 +47,7 @@
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.CSharp"
/>
<InternalsVisibleTo
Include=
"Microsoft.CodeAnalysis.InteractiveEditorFeatures"
/>
<InternalsVisibleTo
Include=
"Microsoft.CodeAnalysis.Remote.ServiceHub"
/>
<InternalsVisibleTo
Include=
"
FSharp.Editor"
Key=
"$(FSharpKey)
"
/>
<InternalsVisibleTo
Include=
"
Microsoft.CodeAnalysis.ExternalAccess.FSharp
"
/>
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.IntegrationTest.Utilities"
/>
<InternalsVisibleTo
Include=
"Roslyn.Services.Test.Utilities"
/>
<InternalsVisibleTo
Include=
"Microsoft.CodeAnalysis.EditorFeatures.UnitTests"
/>
...
...
src/EditorFeatures/Text/Microsoft.CodeAnalysis.EditorFeatures.Text.csproj
浏览文件 @
41c49371
...
...
@@ -39,6 +39,7 @@
<InternalsVisibleTo
Include=
"Microsoft.CodeAnalysis.CSharp.InteractiveEditorFeatures"
/>
<InternalsVisibleTo
Include=
"Microsoft.CodeAnalysis.InteractiveEditorFeatures"
/>
<InternalsVisibleTo
Include=
"Microsoft.CodeAnalysis.VisualBasic.InteractiveEditorFeatures"
/>
<InternalsVisibleTo
Include=
"Microsoft.CodeAnalysis.ExternalAccess.FSharp"
/>
<InternalsVisibleTo
Include=
"Microsoft.CodeAnalysis.TypeScript.EditorFeatures"
Key=
"$(TypeScriptKey)"
/>
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.Implementation"
/>
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.TypeScript"
Key=
"$(TypeScriptKey)"
/>
...
...
@@ -52,8 +53,6 @@
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.Remote.CSharp.16.0"
Key=
"$(RemoteLanguageServiceKey)"
/>
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.Xaml"
/>
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.VisualBasic.Repl"
/>
<InternalsVisibleTo
Include=
"FSharp.Editor"
Key=
"$(FSharpKey)"
/>
<InternalsVisibleTo
Include=
"FSharp.LanguageService"
Key=
"$(FSharpKey)"
/>
<!-- BEGIN MONODEVELOP
These MonoDevelop dependencies don't ship with Visual Studio, so can't break our
binary insertions and are exempted from the ExternalAccess adapter assembly policies.
...
...
src/Tools/ExternalAccess/FSharp/Completion/CompletionOptions.cs
浏览文件 @
41c49371
...
...
@@ -4,6 +4,6 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Completion
{
public
static
class
CompletionOptions
{
public
static
readonly
PerLanguageOption
<
bool
>
BlockForCompletionItems
=
Microsoft
.
CodeAnalysis
.
Completion
.
CompletionOptions
.
BlockForCompletionItems
public
static
readonly
PerLanguageOption
<
bool
>
BlockForCompletionItems
=
Microsoft
.
CodeAnalysis
.
Completion
.
CompletionOptions
.
BlockForCompletionItems
;
}
}
src/Tools/ExternalAccess/FSharp/Diagnostics/
FSharp
DiagnosticAnalyzerService.cs
→
src/Tools/ExternalAccess/FSharp/Diagnostics/DiagnosticAnalyzerService.cs
浏览文件 @
41c49371
...
...
@@ -5,12 +5,12 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.FSharp.Diagnostics
{
[
Export
(
typeof
(
IDiagnosticAnalyzerService
))]
[
Shared
]
internal
sealed
class
FSharp
DiagnosticAnalyzerService
:
IDiagnosticAnalyzerService
internal
class
DiagnosticAnalyzerService
:
IDiagnosticAnalyzerService
{
private
readonly
Microsoft
.
CodeAnalysis
.
Diagnostics
.
IDiagnosticAnalyzerService
_delegatee
;
[
ImportingConstructor
]
public
FSharp
DiagnosticAnalyzerService
(
Microsoft
.
CodeAnalysis
.
Diagnostics
.
IDiagnosticAnalyzerService
delegatee
)
public
DiagnosticAnalyzerService
(
Microsoft
.
CodeAnalysis
.
Diagnostics
.
IDiagnosticAnalyzerService
delegatee
)
{
_delegatee
=
delegatee
;
}
...
...
src/Tools/ExternalAccess/FSharp/Editor/FSharpBraceMatcher.cs
0 → 100644
浏览文件 @
41c49371
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.Editor
;
namespace
Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor
{
[
ExportBraceMatcher
(
LanguageNames
.
FSharp
)]
internal
class
FSharpBraceMatcher
:
IBraceMatcher
{
private
readonly
IFSharpBraceMatcher
_braceMatcher
;
public
FSharpBraceMatcher
(
IFSharpBraceMatcher
braceMatcher
)
{
_braceMatcher
=
braceMatcher
;
}
public
async
Task
<
Microsoft
.
CodeAnalysis
.
Editor
.
BraceMatchingResult
?>
FindBracesAsync
(
Document
document
,
int
position
,
CancellationToken
cancellationToken
=
default
)
{
var
result
=
await
_braceMatcher
.
FindBracesAsync
(
document
,
position
,
cancellationToken
).
ConfigureAwait
(
false
);
if
(
result
.
HasValue
)
{
return
new
Microsoft
.
CodeAnalysis
.
Editor
.
BraceMatchingResult
(
result
.
Value
.
LeftSpan
,
result
.
Value
.
RightSpan
);
}
else
{
return
null
;
}
}
}
}
src/Tools/ExternalAccess/FSharp/Editor/IFSharpBraceMatcher.cs
0 → 100644
浏览文件 @
41c49371
using
System.Threading
;
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.Text
;
namespace
Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor
{
public
struct
BraceMatchingResult
{
public
TextSpan
LeftSpan
{
get
;
}
public
TextSpan
RightSpan
{
get
;
}
public
BraceMatchingResult
(
TextSpan
leftSpan
,
TextSpan
rightSpan
)
:
this
()
{
this
.
LeftSpan
=
leftSpan
;
this
.
RightSpan
=
rightSpan
;
}
}
public
interface
IFSharpBraceMatcher
{
Task
<
BraceMatchingResult
?>
FindBracesAsync
(
Document
document
,
int
position
,
CancellationToken
cancellationToken
=
default
);
}
}
src/Tools/ExternalAccess/FSharp/PublicAPI.Unshipped.txt
浏览文件 @
41c49371
...
...
@@ -3,6 +3,12 @@ Microsoft.CodeAnalysis.ExternalAccess.FSharp.Completion.CompletionOptions
Microsoft.CodeAnalysis.ExternalAccess.FSharp.Diagnostics.DiagnosticCustomTags
Microsoft.CodeAnalysis.ExternalAccess.FSharp.Diagnostics.IDiagnosticAnalyzerService
Microsoft.CodeAnalysis.ExternalAccess.FSharp.Diagnostics.IDiagnosticAnalyzerService.Reanalyze(Microsoft.CodeAnalysis.Workspace workspace, System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.ProjectId> projectIds = null, System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.DocumentId> documentIds = null, bool highPriority = false) -> void
Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.BraceMatchingResult
Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.BraceMatchingResult.BraceMatchingResult(Microsoft.CodeAnalysis.Text.TextSpan leftSpan, Microsoft.CodeAnalysis.Text.TextSpan rightSpan) -> void
Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.BraceMatchingResult.LeftSpan.get -> Microsoft.CodeAnalysis.Text.TextSpan
Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.BraceMatchingResult.RightSpan.get -> Microsoft.CodeAnalysis.Text.TextSpan
Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.IFSharpBraceMatcher
Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.IFSharpBraceMatcher.FindBracesAsync(Microsoft.CodeAnalysis.Document document, int position, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.BraceMatchingResult?>
Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.Shared.Utilities.ClassificationTypeMap
Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.Shared.Utilities.ClassificationTypeMap.ClassificationTypeMap(Microsoft.VisualStudio.Text.Classification.IClassificationTypeRegistryService registryService) -> void
Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.Shared.Utilities.ClassificationTypeMap.GetClassificationType(string name) -> Microsoft.VisualStudio.Text.Classification.IClassificationType
...
...
src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
浏览文件 @
41c49371
...
...
@@ -111,6 +111,7 @@
<InternalsVisibleTo
Include=
"RoslynTaoActions"
/>
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.ErrorList.UnitTests"
/>
<InternalsVisibleTo
Include=
"Roslyn.VisualStudio.Next.UnitTests"
/>
<InternalsVisibleTo
Include=
"Microsoft.CodeAnalysis.ExternalAccess.FSharp"
/>
<InternalsVisibleTo
Include=
"DynamicProxyGenAssembly2"
Key=
"$(MoqPublicKey)"
/>
<InternalsVisibleTo
Include=
"Microsoft.CodeAnalysis.TypeScript.EditorFeatures"
Key=
"$(TypeScriptKey)"
/>
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.TypeScript"
Key=
"$(TypeScriptKey)"
/>
...
...
@@ -126,8 +127,6 @@
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.Remote.CSharp.15.7"
Key=
"$(RemoteLanguageServiceKey)"
/>
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.Remote.CSharp.15.8"
Key=
"$(RemoteLanguageServiceKey)"
/>
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.Remote.CSharp.16.0"
Key=
"$(RemoteLanguageServiceKey)"
/>
<InternalsVisibleTo
Include=
"FSharp.Editor"
Key=
"$(FSharpKey)"
/>
<InternalsVisibleTo
Include=
"FSharp.LanguageService"
Key=
"$(FSharpKey)"
/>
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.Razor"
Key=
"$(RazorKey)"
/>
</ItemGroup>
<ItemGroup>
...
...
src/VisualStudio/Core/Impl/Microsoft.VisualStudio.LanguageServices.Implementation.csproj
浏览文件 @
41c49371
...
...
@@ -25,6 +25,7 @@
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests"
/>
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.UnitTests"
/>
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.Test.Utilities2"
/>
<InternalsVisibleTo
Include=
"Microsoft.CodeAnalysis.ExternalAccess.FSharp"
/>
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.TypeScript"
Key=
"$(TypeScriptKey)"
/>
<InternalsVisibleTo
Include=
"Microsoft.CodeAnalysis.TypeScript.EditorFeatures"
Key=
"$(TypeScriptKey)"
/>
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.Remote"
Key=
"$(RemoteLanguageServiceKey)"
/>
...
...
@@ -35,8 +36,6 @@
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.Remote.CSharp.15.7"
Key=
"$(RemoteLanguageServiceKey)"
/>
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.Remote.CSharp.15.8"
Key=
"$(RemoteLanguageServiceKey)"
/>
<InternalsVisibleTo
Include=
"Microsoft.VisualStudio.LanguageServices.Remote.CSharp.16.0"
Key=
"$(RemoteLanguageServiceKey)"
/>
<InternalsVisibleTo
Include=
"FSharp.Editor"
Key=
"$(FSharpKey)"
/>
<InternalsVisibleTo
Include=
"FSharp.LanguageService"
Key=
"$(FSharpKey)"
/>
</ItemGroup>
<ItemGroup>
<Reference
Include=
"Microsoft.CSharp"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录