Skip to content

Clean unnecessary constructs from LanguageService.fs #6848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KevinRansom merged 1 commit into from
May 27, 2019
Merged

Clean unnecessary constructs from LanguageService.fs #6848

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 10 additions & 31 deletions vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,22 @@

namespace rec Microsoft.VisualStudio.FSharp.Editor

#nowarn "40"

open System
open System.Collections.Concurrent
open System.Collections.Generic
open System.Collections.Immutable
open System.ComponentModel.Composition
open System.ComponentModel.Design
open System.Diagnostics
open System.IO
open System.Linq
open System.Runtime.CompilerServices
open System.Runtime.InteropServices
open System.Threading
open Microsoft.CodeAnalysis
open Microsoft.CodeAnalysis.Diagnostics
open Microsoft.CodeAnalysis.Completion
open Microsoft.CodeAnalysis.Options
open FSharp.Compiler.CompileOps
open FSharp.Compiler.SourceCodeServices
open Microsoft.VisualStudio
open Microsoft.VisualStudio.Editor
open Microsoft.VisualStudio.FSharp.Editor
open Microsoft.VisualStudio.TextManager.Interop
open Microsoft.VisualStudio.LanguageServices
open Microsoft.VisualStudio.LanguageServices.Implementation.LanguageService
open Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem
open Microsoft.VisualStudio.LanguageServices.Implementation.TaskList
open Microsoft.VisualStudio.LanguageServices.ProjectSystem
open Microsoft.VisualStudio.Shell
open Microsoft.VisualStudio.Shell.Events
open Microsoft.VisualStudio.Shell.Interop
open Microsoft.VisualStudio.ComponentModelHost
open Microsoft.VisualStudio.Text.Outlining
open FSharp.NativeInterop

#nowarn "9" // NativePtr.toNativeInt

// Used to expose FSharpChecker/ProjectInfo manager to diagnostic providers
// Diagnostic providers can be executed in environment that does not use MEF so they can rely only
Expand Down Expand Up @@ -68,10 +47,10 @@ type internal FSharpCheckerWorkspaceServiceFactory
projectInfoManager: FSharpProjectOptionsManager
) =
interface Microsoft.CodeAnalysis.Host.Mef.IWorkspaceServiceFactory with
member this.CreateService(_workspaceServices) =
member __.CreateService(_workspaceServices) =
upcast { new FSharpCheckerWorkspaceService with
member this.Checker = checkerProvider.Checker
member this.FSharpProjectOptionsManager = projectInfoManager }
member __.Checker = checkerProvider.Checker
member __.FSharpProjectOptionsManager = projectInfoManager }

[<Sealed>]
type private FSharpSolutionEvents(projectManager: FSharpProjectOptionsManager) =
Expand Down Expand Up @@ -104,7 +83,7 @@ type private FSharpSolutionEvents(projectManager: FSharpProjectOptionsManager) =
type internal FSharpSettingsFactory
[<Composition.ImportingConstructor>] (settings: EditorOptions) =
interface Microsoft.CodeAnalysis.Host.Mef.IWorkspaceServiceFactory with
member this.CreateService(_) = upcast settings
member __.CreateService(_) = upcast settings

[<Guid(FSharpConstants.packageGuidString)>]
[<ProvideOptionPage(typeof<Microsoft.VisualStudio.FSharp.Interactive.FsiPropertyPage>,
Expand Down Expand Up @@ -242,14 +221,14 @@ type internal FSharpLanguageService(package : FSharpPackage) =
let theme = package.ComponentModel.DefaultExportProvider.GetExport<ISetThemeColors>().Value
theme.SetColors()

override this.ContentTypeName = FSharpConstants.FSharpContentTypeName
override this.LanguageName = FSharpConstants.FSharpLanguageName
override this.RoslynLanguageName = FSharpConstants.FSharpLanguageName
override __.ContentTypeName = FSharpConstants.FSharpContentTypeName
override __.LanguageName = FSharpConstants.FSharpLanguageName
override __.RoslynLanguageName = FSharpConstants.FSharpLanguageName

override this.LanguageServiceId = new Guid(FSharpConstants.languageServiceGuidString)
override this.DebuggerLanguageId = DebuggerEnvironment.GetLanguageID()
override __.LanguageServiceId = new Guid(FSharpConstants.languageServiceGuidString)
override __.DebuggerLanguageId = DebuggerEnvironment.GetLanguageID()

override this.CreateContext(_,_,_,_,_) = raise(System.NotImplementedException())
override __.CreateContext(_,_,_,_,_) = raise(System.NotImplementedException())

override this.SetupNewTextView(textView) =
base.SetupNewTextView(textView)
Expand Down