Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
619fa47b
F
fsharp
项目概览
dotNET Platform
/
fsharp
11 个月 前同步成功
通知
0
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
fsharp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
619fa47b
编写于
11月 02, 2017
作者:
K
Kevin Ransom
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Make cross language project references work when references are built"
This reverts commit
87c4f5e0
.
上级
04374727
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
25 deletion
+17
-25
vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs
...tion/src/FSharp.Editor/LanguageService/LanguageService.fs
+5
-5
vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
.../src/FSharp.LanguageService/FSharp.LanguageService.fsproj
+0
-1
vsintegration/src/FSharp.LanguageService/LanguageServiceConstants.fs
...on/src/FSharp.LanguageService/LanguageServiceConstants.fs
+0
-10
vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs
...ration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs
+12
-9
未找到文件。
vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs
浏览文件 @
619fa47b
...
...
@@ -35,7 +35,7 @@ open Microsoft.VisualStudio.Shell
open
Microsoft
.
VisualStudio
.
Shell
.
Interop
open
Microsoft
.
VisualStudio
.
ComponentModelHost
//
/
Exposes FSharpChecker as MEF export
// Exposes FSharpChecker as MEF export
[<
Export
(
typeof
<
FSharpCheckerProvider
>);
Composition
.
Shared
>]
type
internal
FSharpCheckerProvider
[<
ImportingConstructor
>]
...
...
@@ -82,10 +82,10 @@ type internal FSharpCheckerProvider
/// Exposes FCS FSharpProjectOptions information management as MEF component.
//
/
//
/
This service allows analyzers to get an appropriate FSharpProjectOptions value for a project or single file.
//
/
It also allows a 'cheaper' route to get the project options relevant to parsing (e.g. the #define values).
//
/
The main entrypoints are TryGetOptionsForDocumentOrProject and TryGetOptionsForEditingDocumentOrProject.
//
// This service allows analyzers to get an appropriate FSharpProjectOptions value for a project or single file.
// It also allows a 'cheaper' route to get the project options relevant to parsing (e.g. the #define values).
// The main entrypoints are TryGetOptionsForDocumentOrProject and TryGetOptionsForEditingDocumentOrProject.
[<
Export
(
typeof
<
FSharpProjectOptionsManager
>);
Composition
.
Shared
>]
type
internal
FSharpProjectOptionsManager
[<
ImportingConstructor
>]
...
...
vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
浏览文件 @
619fa47b
...
...
@@ -67,7 +67,6 @@
<GeneratedModuleName>
Microsoft.VisualStudio.FSharp.LanguageService.Strings
</GeneratedModuleName>
</EmbeddedResource>
<Compile
Include=
"AssemblyInfo.fs"
/>
<Compile
Include=
"LanguageServiceConstants.fs"
/>
<Compile
Include=
"Error.fs"
/>
<Compile
Include=
"Vs.fs"
/>
<Compile
Include=
"Colorize.fs"
/>
...
...
vsintegration/src/FSharp.LanguageService/LanguageServiceConstants.fs
已删除
100644 → 0
浏览文件 @
04374727
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
namespace
Microsoft
.
VisualStudio
.
FSharp
.
LanguageService
[<
RequireQualifiedAccess
>]
module
internal
LanguageServiceConstants
=
/// "F#"
[<
Literal
>]
let
FSharpLanguageName
=
"F#"
vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs
浏览文件 @
619fa47b
...
...
@@ -34,20 +34,23 @@ module internal rec Microsoft.VisualStudio.FSharp.LanguageService.SiteProvider
open
System
open
System
.
Collections
.
Concurrent
open
System
.
Diagnostics
open
System
.
ComponentModel
.
Composition
open
System
.
IO
open
Microsoft
.
CodeAnalysis
open
System
.
Diagnostics
open
Microsoft
.
VisualStudio
open
Microsoft
.
VisualStudio
.
TextManager
.
Interop
open
Microsoft
.
VisualStudio
.
Shell
.
Interop
open
Microsoft
.
FSharp
.
Compiler
.
SourceCodeServices
open
Microsoft
.
VisualStudio
open
Microsoft
.
VisualStudio
.
FSharp
.
LanguageService
open
Microsoft
.
CodeAnalysis
open
Microsoft
.
VisualStudio
.
LanguageServices
open
Microsoft
.
VisualStudio
.
LanguageServices
.
Implementation
.
ProjectSystem
open
Microsoft
.
VisualStudio
.
LanguageServices
.
Implementation
.
TaskList
open
Microsoft
.
VisualStudio
.
Shell
.
Interop
open
Microsoft
.
VisualStudio
.
TextManager
.
Interop
open
VSLangProj
open
System
.
ComponentModel
.
Composition
.
Primitives
open
Microsoft
.
VisualStudio
.
Shell
open
System
.
Collections
.
Immutable
/// An additional interface that an IProjectSite object can implement to indicate it has an FSharpProjectOptions
/// already available, so we don't have to recreate it
...
...
@@ -271,7 +274,7 @@ type internal ProjectSitesAndFiles() =
if
not
(
isNull
project
)
then
for
reference
in
project
.
ProjectReferences
do
let
project
=
workspace
.
CurrentSolution
.
GetProject
(
reference
.
ProjectId
)
if
not
(
isNull
project
)
&&
project
.
Language
=
LanguageServiceConstants
.
FSharpLanguageName
then
if
not
(
isNull
project
)
then
let
siteProvider
=
provideProjectSiteProvider
(
workspace
,
project
,
serviceProvider
,
projectOptionsTable
)
let
referenceProject
=
workspace
.
ProjectTracker
.
GetProject
(
reference
.
ProjectId
)
let
outputPath
=
referenceProject
.
BinOutputPath
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录