NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit651b6d6

Kevin Ransom

committed

Revert "Make cross language project references work when references are built"

This reverts commit87c4f5e.

1 parent0437472 commit651b6d6Copy full SHA for 651b6d6

File tree

4 files changed

+17

-25

lines changed

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

4 files changed

+17

-25

lines changed

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

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ open Microsoft.VisualStudio.Shell`
`35`	`35`	`openMicrosoft.VisualStudio.Shell.Interop`
`36`	`36`	`openMicrosoft.VisualStudio.ComponentModelHost`
`37`	`37`
`38`		`-/// Exposes FSharpChecker as MEF export`
	`38`	`+// Exposes FSharpChecker as MEF export`
`39`	`39`	`[<Export(typeof<FSharpCheckerProvider>); Composition.Shared>]`
`40`	`40`	`typeinternalFSharpCheckerProvider`
`41`	`41`	`[<ImportingConstructor>]`
`@@ -82,10 +82,10 @@ type internal FSharpCheckerProvider`
`82`	`82`
`83`	`83`
`84`	`84`	`/// 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.`
`89`	`89`	`[<Export(typeof<FSharpProjectOptionsManager>); Composition.Shared>]`
`90`	`90`	`typeinternalFSharpProjectOptionsManager`
`91`	`91`	`[<ImportingConstructor>]`

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

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@`
`67`	`67`	`<GeneratedModuleName>Microsoft.VisualStudio.FSharp.LanguageService.Strings</GeneratedModuleName>`
`68`	`68`	`</EmbeddedResource>`
`69`	`69`	`<CompileInclude="AssemblyInfo.fs" />`
`70`		`- <CompileInclude="LanguageServiceConstants.fs" />`
`71`	`70`	`<CompileInclude="Error.fs" />`
`72`	`71`	`<CompileInclude="Vs.fs" />`
`73`	`72`	`<CompileInclude="Colorize.fs" />`

`‎vsintegration/src/FSharp.LanguageService/LanguageServiceConstants.fs‎`

Lines changed: 0 additions & 10 deletions

This file was deleted.

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

Lines changed: 12 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,20 +34,23 @@ module internal rec Microsoft.VisualStudio.FSharp.LanguageService.SiteProvider`
`34`	`34`
`35`	`35`	`openSystem`
`36`	`36`	`openSystem.Collections.Concurrent`
`37`		`-openSystem.Diagnostics`
	`37`	`+openSystem.ComponentModel.Composition`
`38`	`38`	`openSystem.IO`
`39`		`-`
`40`		`-openMicrosoft.CodeAnalysis`
	`39`	`+openSystem.Diagnostics`
	`40`	`+openMicrosoft.VisualStudio`
	`41`	`+openMicrosoft.VisualStudio.TextManager.Interop`
	`42`	`+openMicrosoft.VisualStudio.Shell.Interop`
`41`	`43`	`openMicrosoft.FSharp.Compiler.SourceCodeServices`
`42`	`44`
`43`		`-openMicrosoft.VisualStudio`
`44`		`-openMicrosoft.VisualStudio.FSharp.LanguageService`
	`45`	`+openMicrosoft.CodeAnalysis`
	`46`	`+openMicrosoft.VisualStudio.LanguageServices`
`45`	`47`	`openMicrosoft.VisualStudio.LanguageServices.Implementation.ProjectSystem`
`46`	`48`	`openMicrosoft.VisualStudio.LanguageServices.Implementation.TaskList`
`47`		`-openMicrosoft.VisualStudio.Shell.Interop`
`48`		`-openMicrosoft.VisualStudio.TextManager.Interop`
`49`		`-`
`50`	`49`	`openVSLangProj`
	`50`	`+openSystem.ComponentModel.Composition.Primitives`
	`51`	`+openMicrosoft.VisualStudio.Shell`
	`52`	`+openSystem.Collections.Immutable`
	`53`	`+`
`51`	`54`
`52`	`55`	`/// An additional interface that an IProjectSite object can implement to indicate it has an FSharpProjectOptions`
`53`	`56`	`/// already available, so we don't have to recreate it`
`@@ -271,7 +274,7 @@ type internal ProjectSitesAndFiles() =`
`271`	`274`	`ifnot(isNull project)then`
`272`	`275`	`for referencein project.ProjectReferencesdo`
`273`	`276`	`letproject= workspace.CurrentSolution.GetProject(reference.ProjectId)`
`274`		`-ifnot(isNull project)&& project.Language= LanguageServiceConstants.FSharpLanguageNamethen`
	`277`	`+ifnot(isNull project)then`
`275`	`278`	`letsiteProvider= provideProjectSiteProvider(workspace, project, serviceProvider, projectOptionsTable)`
`276`	`279`	`letreferenceProject= workspace.ProjectTracker.GetProject(reference.ProjectId)`
`277`	`280`	`letoutputPath= referenceProject.BinOutputPath`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit651b6d6

File tree

4 files changed

4 files changed

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

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

`‎vsintegration/src/FSharp.LanguageService/LanguageServiceConstants.fs‎`

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

0 commit comments