Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit87c4f5e

Browse files
author
Kevin Ransom
committed
Make cross language project references work when references are built
1 parent1adf07b commit87c4f5e

File tree

4 files changed

+25
-17
lines changed

4 files changed

+25
-17
lines changed

‎vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ open Microsoft.VisualStudio.Shell
3535
openMicrosoft.VisualStudio.Shell.Interop
3636
openMicrosoft.VisualStudio.ComponentModelHost
3737

38-
// Exposes FSharpChecker as MEF export
38+
/// Exposes FSharpChecker as MEF export
3939
[<Export(typeof<FSharpCheckerProvider>); Composition.Shared>]
4040
typeinternalFSharpCheckerProvider
4141
[<ImportingConstructor>]
@@ -82,10 +82,10 @@ type internal FSharpCheckerProvider
8282

8383

8484
/// Exposes FCS FSharpProjectOptions information management as MEF component.
85-
//
86-
// This service allows analyzers to get an appropriate FSharpProjectOptions value for a project or single file.
87-
// It also allows a 'cheaper' route to get the project options relevant to parsing (e.g. the #define values).
88-
// The main entrypoints are TryGetOptionsForDocumentOrProject and TryGetOptionsForEditingDocumentOrProject.
85+
///
86+
/// This service allows analyzers to get an appropriate FSharpProjectOptions value for a project or single file.
87+
/// It also allows a 'cheaper' route to get the project options relevant to parsing (e.g. the #define values).
88+
/// The main entrypoints are TryGetOptionsForDocumentOrProject and TryGetOptionsForEditingDocumentOrProject.
8989
[<Export(typeof<FSharpProjectOptionsManager>); Composition.Shared>]
9090
typeinternalFSharpProjectOptionsManager
9191
[<ImportingConstructor>]

‎vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<GeneratedModuleName>Microsoft.VisualStudio.FSharp.LanguageService.Strings</GeneratedModuleName>
6868
</EmbeddedResource>
6969
<CompileInclude="AssemblyInfo.fs" />
70+
<CompileInclude="LanguageServiceConstants.fs" />
7071
<CompileInclude="Error.fs" />
7172
<CompileInclude="Vs.fs" />
7273
<CompileInclude="Colorize.fs" />
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
2+
3+
namespaceMicrosoft.VisualStudio.FSharp.LanguageService
4+
5+
[<RequireQualifiedAccess>]
6+
moduleinternalLanguageServiceConstants=
7+
8+
/// "F#"
9+
[<Literal>]
10+
letFSharpLanguageName="F#"

‎vsintegration/src/FSharp.LanguageService/ProjectSitesAndFiles.fs‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,20 @@ module internal rec Microsoft.VisualStudio.FSharp.LanguageService.SiteProvider
3434

3535
openSystem
3636
openSystem.Collections.Concurrent
37-
openSystem.ComponentModel.Composition
38-
openSystem.IO
3937
openSystem.Diagnostics
40-
openMicrosoft.VisualStudio
41-
openMicrosoft.VisualStudio.TextManager.Interop
42-
openMicrosoft.VisualStudio.Shell.Interop
43-
openMicrosoft.FSharp.Compiler.SourceCodeServices
38+
openSystem.IO
4439

4540
openMicrosoft.CodeAnalysis
46-
openMicrosoft.VisualStudio.LanguageServices
41+
openMicrosoft.FSharp.Compiler.SourceCodeServices
42+
43+
openMicrosoft.VisualStudio
44+
openMicrosoft.VisualStudio.FSharp.LanguageService
4745
openMicrosoft.VisualStudio.LanguageServices.Implementation.ProjectSystem
4846
openMicrosoft.VisualStudio.LanguageServices.Implementation.TaskList
49-
openVSLangProj
50-
openSystem.ComponentModel.Composition.Primitives
51-
openMicrosoft.VisualStudio.Shell
52-
openSystem.Collections.Immutable
47+
openMicrosoft.VisualStudio.Shell.Interop
48+
openMicrosoft.VisualStudio.TextManager.Interop
5349

50+
openVSLangProj
5451

5552
/// An additional interface that an IProjectSite object can implement to indicate it has an FSharpProjectOptions
5653
/// already available, so we don't have to recreate it
@@ -274,7 +271,7 @@ type internal ProjectSitesAndFiles() =
274271
ifnot(isNull project)then
275272
for referencein project.ProjectReferencesdo
276273
letproject= workspace.CurrentSolution.GetProject(reference.ProjectId)
277-
ifnot(isNull project)then
274+
ifnot(isNull project)&& project.Language= LanguageServiceConstants.FSharpLanguageNamethen
278275
letsiteProvider= provideProjectSiteProvider(workspace, project, serviceProvider, projectOptionsTable)
279276
letreferenceProject= workspace.ProjectTracker.GetProject(reference.ProjectId)
280277
letoutputPath= referenceProject.BinOutputPath

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp