Refactor QuickInfoProvider (#2778)

* refactor QuickInfoProvider

* fix wrong "this symbol range"

* further refactoring

vsintegration/src/FSharp.Editor/CodeFix/AddOpenCodeFixProvider.fs

@@ -101,7 +101,7 @@ type internal FSharpAddOpenCodeFixProvider
             
             let! symbol = 
                 asyncMaybe {
-                    let! lexerSymbol = Tokenizer.getSymbolAtPosition(document.Id, sourceText, context.Span.End, document.FilePath, defines, Tokenizer.SymbolLookupKind.Greedy)
+                    let! lexerSymbol = Tokenizer.getSymbolAtPosition(document.Id, sourceText, context.Span.End, document.FilePath, defines, SymbolLookupKind.Greedy)
                     return! checkResults.GetSymbolUseAtLocation(Line.fromZ linePos.Line, lexerSymbol.Ident.idRange.EndColumn, line.ToString(), lexerSymbol.FullIsland)
                 } |> liftAsync
 

vsintegration/src/FSharp.Editor/CodeFix/ImplementInterfaceCodeFixProvider.fs

@@ -169,7 +169,7 @@ type internal FSharpImplementInterfaceCodeFixProvider
                 | _ -> 
                     Some context.Span.End
             let! interfaceState = queryInterfaceState appendBracketAt interfacePos tokens parsedInput                        
-            let! symbol = Tokenizer.getSymbolAtPosition(context.Document.Id, sourceText, fixupPosition, context.Document.FilePath, defines, Tokenizer.SymbolLookupKind.Greedy)
+            let! symbol = Tokenizer.getSymbolAtPosition(context.Document.Id, sourceText, fixupPosition, context.Document.FilePath, defines, SymbolLookupKind.Greedy)
             let fcsTextLineNumber = textLine.LineNumber + 1
             let lineContents = textLine.ToString()                            
             let! options = context.Document.GetOptionsAsync(cancellationToken)

vsintegration/src/FSharp.Editor/Common/RoslynHelpers.fs

@@ -13,10 +13,9 @@ open Microsoft.FSharp.Compiler
 open Microsoft.FSharp.Compiler.Layout
 open Microsoft.FSharp.Compiler.SourceCodeServices
 open Microsoft.FSharp.Compiler.Range
-open Microsoft.FSharp.Compiler.Ast
-open Microsoft.FSharp.Compiler.SourceCodeServices
 open Microsoft.VisualStudio.FSharp.LanguageService
 
+[<RequireQualifiedAccess>]
 module internal RoslynHelpers =
 
     let FSharpRangeToTextSpan(sourceText: SourceText, range: range) =

vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs

@@ -21,8 +21,6 @@ open Microsoft.VisualStudio.Shell.Interop
 open Microsoft.FSharp.Compiler
 open Microsoft.FSharp.Compiler.Range
 open Microsoft.FSharp.Compiler.SourceCodeServices
-open Tokenizer
-
 
 type internal FSharpCompletionProvider
     (
@@ -142,7 +140,7 @@ type internal FSharpCompletionProvider
             let maxHints = if mruItems.Values.Count = 0 then 0 else Seq.max mruItems.Values
 
             sortedDeclItems |> Array.iteri (fun number declItem ->
-                let glyph = FSharpGlyphToRoslynGlyph (declItem.Glyph, declItem.Accessibility)
+                let glyph = Tokenizer.FSharpGlyphToRoslynGlyph (declItem.Glyph, declItem.Accessibility)
                 let name =
                     match entityKind, declItem.NamespaceToOpen with
                     | Some EntityKind.Attribute, _ when declItem.IsAttribute && declItem.Name.EndsWith "Attribute"  ->

vsintegration/src/FSharp.Editor/DocumentHighlights/DocumentHighlightsService.fs

@@ -56,7 +56,7 @@ type internal FSharpDocumentHighlightsService [<ImportingConstructor>] (checkerP
             let textLine = sourceText.Lines.GetLineFromPosition(position)
             let textLinePos = sourceText.Lines.GetLinePosition(position)
             let fcsTextLineNumber = Line.fromZ textLinePos.Line
-            let! symbol = Tokenizer.getSymbolAtPosition(documentKey, sourceText, position, filePath, defines, Tokenizer.SymbolLookupKind.Greedy)
+            let! symbol = Tokenizer.getSymbolAtPosition(documentKey, sourceText, position, filePath, defines, SymbolLookupKind.Greedy)
             let! _, _, checkFileResults = checker.ParseAndCheckDocument(filePath, textVersionHash, sourceText.ToString(), options, allowStaleResults = true)
             let! symbolUse = checkFileResults.GetSymbolUseAtLocation(fcsTextLineNumber, symbol.Ident.idRange.EndColumn, textLine.ToString(), symbol.FullIsland)
             let! symbolUses = checkFileResults.GetUsesOfSymbolInFile(symbolUse.Symbol) |> liftAsync

vsintegration/src/FSharp.Editor/InlineRename/InlineRenameService.fs

@@ -17,10 +17,8 @@ open Microsoft.CodeAnalysis.Text
 open Microsoft.FSharp.Compiler
 open Microsoft.FSharp.Compiler.Range
 open Microsoft.FSharp.Compiler.SourceCodeServices
-open Tokenizer
 open Symbols
 
-
 type internal FailureInlineRenameInfo private () =
     interface IInlineRenameInfo with
         member __.CanRename = false

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

@@ -8,16 +8,12 @@ open Microsoft.CodeAnalysis.Text
 open Microsoft.FSharp.Compiler
 open Microsoft.FSharp.Compiler.Ast
 open Microsoft.FSharp.Compiler.SourceCodeServices
-open Tokenizer
-open Symbols
 open TypedAstUtils
 
-
 type CheckResults =
     | Ready of (FSharpParseFileResults * FSharpCheckFileResults) option
     | StillRunning of Async<(FSharpParseFileResults * FSharpCheckFileResults) option>
     
-    
 type FSharpChecker with
     member this.ParseDocument(document: Document, options: FSharpProjectOptions, sourceText: string) =
         asyncMaybe {

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

@@ -65,7 +65,7 @@ module internal SymbolHelpers =
             do! Option.guard (originalText.Length > 0)
             let! options = projectInfoManager.TryGetOptionsForEditingDocumentOrProject document
             let defines = CompilerEnvironment.GetCompilationDefinesForEditing(document.Name, options.OtherOptions |> Seq.toList)
-            let! symbol = Tokenizer.getSymbolAtPosition(document.Id, sourceText, symbolSpan.Start, document.FilePath, defines, Tokenizer.SymbolLookupKind.Greedy)
+            let! symbol = Tokenizer.getSymbolAtPosition(document.Id, sourceText, symbolSpan.Start, document.FilePath, defines, SymbolLookupKind.Greedy)
             let! _, _, checkFileResults = checker.ParseAndCheckDocument(document, options, allowStaleResults = true)
             let textLine = sourceText.Lines.GetLineFromPosition(symbolSpan.Start)
             let textLinePos = sourceText.Lines.GetLinePosition(symbolSpan.Start)

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

-module internal Microsoft.VisualStudio.FSharp.Editor.Tokenizer
+namespace Microsoft.VisualStudio.FSharp.Editor
 
 open System
 open System.Collections.Generic
@@ -17,7 +17,7 @@ open Microsoft.FSharp.Compiler.SourceCodeServices
 
 
 [<RequireQualifiedAccess>]
-type LexerSymbolKind =
+type internal LexerSymbolKind =
     | Ident
     | Operator
     | Punctuation
@@ -25,7 +25,7 @@ type LexerSymbolKind =
     | StaticallyResolvedTypeParameter
     | Other
 
-type LexerSymbol =
+type internal LexerSymbol =
     { Kind: LexerSymbolKind
       /// Last part of `LongIdent`
       Ident: Ident
@@ -34,15 +34,16 @@ type LexerSymbol =
     member x.Range: Range.range = x.Ident.idRange
 
 [<RequireQualifiedAccess>]
-type SymbolLookupKind =
+type internal SymbolLookupKind =
     /// Position must lay inside symbol range.
     | Precise
     /// Position may lay one column outside of symbol range to the right.
     | Greedy
 
+[<RequireQualifiedAccess>]
+module internal Tokenizer =
 
-
-let inline (|Public|Internal|Protected|Private|) (a: FSharpAccessibility option) =
+    let (|Public|Internal|Protected|Private|) (a: FSharpAccessibility option) =
         match a with
         | None -> Public
         | Some a ->
@@ -51,7 +52,7 @@ let inline (|Public|Internal|Protected|Private|) (a: FSharpAccessibility option)
             elif a.IsPrivate then Private
             else Protected
 
-let FSharpGlyphToRoslynGlyph (glyph: FSharpGlyph, accessibility: FSharpAccessibility option) =
+    let FSharpGlyphToRoslynGlyph (glyph: FSharpGlyph, accessibility: FSharpAccessibility option) =
         match glyph with
         | FSharpGlyph.Class
         | FSharpGlyph.Exception
@@ -135,7 +136,7 @@ let FSharpGlyphToRoslynGlyph (glyph: FSharpGlyph, accessibility: FSharpAccessibi
         | FSharpGlyph.Variable -> Glyph.Local
         | FSharpGlyph.Error -> Glyph.Error
 
-let GetGlyphForSymbol (symbol: FSharpSymbol, kind: LexerSymbolKind) =
+    let GetGlyphForSymbol (symbol: FSharpSymbol, kind: LexerSymbolKind) =
         match kind with
         | LexerSymbolKind.Operator -> Glyph.Operator
         | _ ->
@@ -234,7 +235,7 @@ let GetGlyphForSymbol (symbol: FSharpSymbol, kind: LexerSymbolKind) =
             | _ -> Glyph.None
 
 
-type private SourceLineData(lineStart: int, lexStateAtStartOfLine: FSharpTokenizerLexState, lexStateAtEndOfLine: FSharpTokenizerLexState, 
+    type private SourceLineData(lineStart: int, lexStateAtStartOfLine: FSharpTokenizerLexState, lexStateAtEndOfLine: FSharpTokenizerLexState, 
                                 hashCode: int, classifiedSpans: IReadOnlyList<ClassifiedSpan>, tokens: FSharpTokenInfo list) =
         member val LineStart = lineStart
         member val LexStateAtStartOfLine = lexStateAtStartOfLine
@@ -248,7 +249,7 @@ type private SourceLineData(lineStart: int, lexStateAtStartOfLine: FSharpTokeniz
             let lineContents = textLine.Text.ToString(textLine.Span)
             data.HashCode = lineContents.GetHashCode() 
     
-type private SourceTextData(approxLines: int) =
+    type private SourceTextData(approxLines: int) =
         let data = ResizeArray<SourceLineData option>(approxLines)
         let extendTo i =
             if i >= data.Count then 
@@ -265,9 +266,9 @@ type private SourceTextData(approxLines: int) =
                 data.[i] <- None
                 i <- i + 1
 
-let private dataCache = ConditionalWeakTable<DocumentId, SourceTextData>()
+    let private dataCache = ConditionalWeakTable<DocumentId, SourceTextData>()
 
-let compilerTokenToRoslynToken(colorKind: FSharpTokenColorKind) : string = 
+    let compilerTokenToRoslynToken(colorKind: FSharpTokenColorKind) : string = 
         match colorKind with
         | FSharpTokenColorKind.Comment -> ClassificationTypeNames.Comment
         | FSharpTokenColorKind.Identifier -> ClassificationTypeNames.Identifier
@@ -282,7 +283,7 @@ let compilerTokenToRoslynToken(colorKind: FSharpTokenColorKind) : string =
         | FSharpTokenColorKind.Punctuation -> ClassificationTypeNames.Punctuation
         | FSharpTokenColorKind.Default | _ -> ClassificationTypeNames.Text
 
-let private scanSourceLine(sourceTokenizer: FSharpSourceTokenizer, textLine: TextLine, lineContents: string, lexState: FSharpTokenizerLexState) : SourceLineData =
+    let private scanSourceLine(sourceTokenizer: FSharpSourceTokenizer, textLine: TextLine, lineContents: string, lexState: FSharpTokenizerLexState) : SourceLineData =
         let colorMap = Array.create textLine.Span.Length ClassificationTypeNames.Text
         let lineTokenizer = sourceTokenizer.CreateLineTokenizer(lineContents)
         let tokens = ResizeArray()
@@ -317,7 +318,7 @@ let private scanSourceLine(sourceTokenizer: FSharpSourceTokenizer, textLine: Tex
 
         SourceLineData(textLine.Start, lexState, previousLexState.Value, lineContents.GetHashCode(), classifiedSpans, List.ofSeq tokens)
 
-let getColorizationData(documentKey: DocumentId, sourceText: SourceText, textSpan: TextSpan, fileName: string option, defines: string list, 
+    let getColorizationData(documentKey: DocumentId, sourceText: SourceText, textSpan: TextSpan, fileName: string option, defines: string list, 
                             cancellationToken: CancellationToken) : List<ClassifiedSpan> =
             try
                 let sourceTokenizer = FSharpSourceTokenizer(defines, fileName)
@@ -378,16 +379,16 @@ let getColorizationData(documentKey: DocumentId, sourceText: SourceText, textSpa
                 Assert.Exception(ex)
                 List<ClassifiedSpan>()
 
-type private DraftToken = {   
+    type private DraftToken = {   
         Kind: LexerSymbolKind
         Token: FSharpTokenInfo 
         RightColumn: int 
-} with
+    } with
         static member inline Create kind token = 
             { Kind = kind; Token = token; RightColumn = token.LeftColumn + token.FullMatchedLength - 1 }
     
-/// Returns symbol at a given position.
-let private getSymbolFromTokens (fileName: string, tokens: FSharpTokenInfo list, linePos: LinePosition, lineStr: string, lookupKind: SymbolLookupKind) : LexerSymbol option =
+    /// Returns symbol at a given position.
+    let private getSymbolFromTokens (fileName: string, tokens: FSharpTokenInfo list, linePos: LinePosition, lineStr: string, lookupKind: SymbolLookupKind) : LexerSymbol option =
         let isIdentifier t = t.CharClass = FSharpTokenCharKind.Identifier
         let isOperator t = t.ColorClass = FSharpTokenColorKind.Operator
         let isPunctuation t = t.ColorClass = FSharpTokenColorKind.Punctuation
@@ -475,7 +476,7 @@ let private getSymbolFromTokens (fileName: string, tokens: FSharpTokenInfo list,
                             (Range.mkPos (linePos.Line + 1) (token.RightColumn + 1))) 
                 FullIsland = plid @ [identStr] })
 
-let private getCachedSourceLineData(documentKey: DocumentId, sourceText: SourceText, position: int, fileName: string, defines: string list) = 
+    let private getCachedSourceLineData(documentKey: DocumentId, sourceText: SourceText, position: int, fileName: string, defines: string list) = 
         let textLine = sourceText.Lines.GetLineFromPosition(position)
         let textLinePos = sourceText.Lines.GetLinePosition(position)
         let lineNumber = textLinePos.Line + 1 // FCS line number
@@ -509,7 +510,7 @@ let private getCachedSourceLineData(documentKey: DocumentId, sourceText: SourceT
             sourceTextData.[lineNumber] <- Some newData
             newData, textLinePos, lineContents
            
-let tokenizeLine (documentKey, sourceText, position, fileName, defines) =
+    let tokenizeLine (documentKey, sourceText, position, fileName, defines) =
         try
             let lineData, _, _ = getCachedSourceLineData(documentKey, sourceText, position, fileName, defines)
             lineData.Tokens   
@@ -518,7 +519,7 @@ let tokenizeLine (documentKey, sourceText, position, fileName, defines) =
             Assert.Exception(ex)
             []
 
-let getSymbolAtPosition(documentKey: DocumentId, sourceText: SourceText, position: int, fileName: string, defines: string list, lookupKind: SymbolLookupKind) : LexerSymbol option =
+    let getSymbolAtPosition(documentKey: DocumentId, sourceText: SourceText, position: int, fileName: string, defines: string list, lookupKind: SymbolLookupKind) : LexerSymbol option =
         try
             let lineData, textLinePos, lineContents = getCachedSourceLineData(documentKey, sourceText, position, fileName, defines)
             getSymbolFromTokens(fileName, lineData.Tokens, textLinePos, lineContents, lookupKind)
@@ -528,14 +529,14 @@ let getSymbolAtPosition(documentKey: DocumentId, sourceText: SourceText, positio
             Assert.Exception(ex)
             None
 
-/// Fix invalid span if it appears to have redundant suffix and prefix.
-let fixupSpan (sourceText: SourceText, span: TextSpan) : TextSpan =
+    /// Fix invalid span if it appears to have redundant suffix and prefix.
+    let fixupSpan (sourceText: SourceText, span: TextSpan) : TextSpan =
         let text = sourceText.GetSubText(span).ToString()
         match text.LastIndexOf '.' with
         | -1 | 0 -> span
         | index -> TextSpan(span.Start + index + 1, text.Length - index - 1)
 
-let isValidNameForSymbol (lexerSymbolKind: LexerSymbolKind, symbol: FSharpSymbol, name: string) : bool =
+    let isValidNameForSymbol (lexerSymbolKind: LexerSymbolKind, symbol: FSharpSymbol, name: string) : bool =
         let doubleBackTickDelimiter = "``"
         
         let isDoubleBacktickIdent (s: string) =

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

 module internal Microsoft.VisualStudio.FSharp.Editor.TypedAstUtils 
 
 open System
-open Microsoft.FSharp.Compiler.Ast
 open Microsoft.FSharp.Compiler.SourceCodeServices
 open Microsoft.VisualStudio.FSharp.Editor
 
-
 open System.Text.RegularExpressions
 
 let isAttribute<'T> (attribute: FSharpAttribute) =
@@ -43,7 +41,6 @@ let private UnnamedUnionFieldRegex = Regex("^Item(\d+)?$", RegexOptions.Compiled
     
 let isUnnamedUnionCaseField (field: FSharpField) = UnnamedUnionFieldRegex.IsMatch(field.Name)
 
-
 module TypedAstPatterns =
 
     let (|AbbreviatedType|_|) (entity: FSharpEntity) =

vsintegration/src/FSharp.Editor/Navigation/FindUsagesService.fs

@@ -54,7 +54,7 @@ type internal FSharpFindUsagesService
             let lineNumber = sourceText.Lines.GetLinePosition(position).Line + 1
             let defines = CompilerEnvironment.GetCompilationDefinesForEditing(document.FilePath, options.OtherOptions |> Seq.toList)
             
-            let! symbol = Tokenizer.getSymbolAtPosition(document.Id, sourceText, position, document.FilePath, defines, Tokenizer.SymbolLookupKind.Greedy)
+            let! symbol = Tokenizer.getSymbolAtPosition(document.Id, sourceText, position, document.FilePath, defines, SymbolLookupKind.Greedy)
             let! symbolUse = checkFileResults.GetSymbolUseAtLocation(lineNumber, symbol.Ident.idRange.EndColumn, textLine, symbol.FullIsland)
             let! declaration = checkFileResults.GetDeclarationLocationAlternate (lineNumber, symbol.Ident.idRange.EndColumn, textLine, symbol.FullIsland, false) |> liftAsync
             let tags = GlyphTags.GetTags(Tokenizer.GetGlyphForSymbol (symbolUse.Symbol, symbol.Kind))

vsintegration/src/FSharp.Editor/Navigation/GoToDefinitionService.fs

@@ -45,7 +45,7 @@ module internal FSharpGoToDefinition =
             let textLine = sourceText.Lines.GetLineFromPosition position
             let textLinePos = sourceText.Lines.GetLinePosition position
             let fcsTextLineNumber = Line.fromZ textLinePos.Line
-            let! lexerSymbol = Tokenizer.getSymbolAtPosition(documentKey, sourceText, position, filePath, defines, Tokenizer.SymbolLookupKind.Greedy)
+            let! lexerSymbol = Tokenizer.getSymbolAtPosition(documentKey, sourceText, position, filePath, defines, SymbolLookupKind.Greedy)
             let! _, _, checkFileResults = 
                 checker.ParseAndCheckDocument 
                     (filePath, textVersionHash, sourceText.ToString(), options, allowStaleResults = preferSignature) 
@@ -82,22 +82,17 @@ module internal FSharpGoToDefinition =
         asyncMaybe {
             let! projectOptions = projectInfoManager.TryGetOptionsForEditingDocumentOrProject originDocument
             let defines = CompilerEnvironment.GetCompilationDefinesForEditing (originDocument.FilePath, projectOptions.OtherOptions |> Seq.toList)
-
             let originTextSpan = RoslynHelpers.FSharpRangeToTextSpan (sourceText, originRange)
             let position = originTextSpan.Start
-
-            let! lexerSymbol = 
-                Tokenizer.getSymbolAtPosition 
-                    (originDocument.Id, sourceText, position, originDocument.FilePath, defines, Tokenizer.SymbolLookupKind.Greedy)
-            
+            let! lexerSymbol = Tokenizer.getSymbolAtPosition(originDocument.Id, sourceText, position, originDocument.FilePath, defines, SymbolLookupKind.Greedy)
             let textLinePos = sourceText.Lines.GetLinePosition position
             let fcsTextLineNumber = Line.fromZ textLinePos.Line
             let lineText = (sourceText.Lines.GetLineFromPosition position).ToString()  
             
             let! _, _, checkFileResults = 
                 checker.ParseAndCheckDocument (originDocument,projectOptions,allowStaleResults=true,sourceText=sourceText)
-            let idRange = lexerSymbol.Ident.idRange
             
+            let idRange = lexerSymbol.Ident.idRange
             let! fsSymbolUse = checkFileResults.GetSymbolUseAtLocation (fcsTextLineNumber, idRange.EndColumn, lineText, lexerSymbol.FullIsland)
             let symbol = fsSymbolUse.Symbol
             // if the tooltip was spawned in an implementation file and we have a range targeting
@@ -109,10 +104,7 @@ module internal FSharpGoToDefinition =
                 let! implDoc = originDocument.Project.Solution.TryGetDocumentFromPath fsfilePath
                 let! implSourceText = implDoc.GetTextAsync ()
                 let! projectOptions = projectInfoManager.TryGetOptionsForEditingDocumentOrProject implDoc
-                let! _, _, checkFileResults = 
-                    checker.ParseAndCheckDocument (implDoc, projectOptions, allowStaleResults=true, sourceText=implSourceText)
-                
-
+                let! _, _, checkFileResults = checker.ParseAndCheckDocument (implDoc, projectOptions, allowStaleResults=true, sourceText=implSourceText)
                 let! symbolUses = checkFileResults.GetUsesOfSymbolInFile symbol |> liftAsync
                 let! implSymbol  = symbolUses |> Array.tryHead 
                 let implTextSpan = RoslynHelpers.FSharpRangeToTextSpan (implSourceText, implSymbol.RangeAlternate)
@@ -127,13 +119,11 @@ module internal FSharpGoToDefinition =
         (targetDocument:Document, symbolRange:range, targetSource:SourceText, checker: FSharpChecker, projectInfoManager: ProjectInfoManager) =
         findSymbolHelper (targetDocument, symbolRange, targetSource,true, checker, projectInfoManager) 
 
-
     /// find the definition location (implementation file/.fs) of the target symbol
     let findDefinitionOfSymbolAtRange
         (targetDocument:Document, symbolRange:range, targetSourceText:SourceText, checker: FSharpChecker, projectInfoManager: ProjectInfoManager) =
         findSymbolHelper (targetDocument, symbolRange, targetSourceText,false, checker, projectInfoManager)
     
-    
     /// use the targetSymbol to find the first instance of its presence in the provided source file
     let findSymbolDeclarationInFile
         (targetSymbolUse:FSharpSymbolUse, filePath:string, source:string, checker:FSharpChecker, projectOptions:FSharpProjectOptions, fileVersion:int) = 
@@ -148,7 +138,6 @@ module internal FSharpGoToDefinition =
                 return implSymbol.RangeAlternate
         }
 
-
 open FSharpGoToDefinition
 
 [<Shared>]
@@ -213,7 +202,6 @@ type internal FSharpGoToDefinitionService [<ImportingConstructor>]
             clearStatusBarAfter 4000
             true
 
-
     /// Navigate to the positon of the textSpan in the provided document
     // used by quickinfo link navigation when the tooltip contains the correct destination range
     member this.TryNavigateToTextSpan (document:Document, textSpan:TextSpan) =
@@ -227,7 +215,6 @@ type internal FSharpGoToDefinitionService [<ImportingConstructor>]
         clearStatusBarAfter 4000
         false
 
-
     /// find the declaration location (signature file/.fsi) of the target symbol if possible, fall back to definition 
     member this.NavigateToSymbolDeclarationAsync (targetDocument:Document, targetSourceText:SourceText, symbolRange:range) = async {
         
@@ -237,7 +224,6 @@ type internal FSharpGoToDefinitionService [<ImportingConstructor>]
         return tryNavigateToItem navresult
     }
 
-
      /// find the definition location (implementation file/.fs) of the target symbol
     member this.NavigateToSymbolDefinitionAsync (targetDocument:Document, targetSourceText:SourceText, symbolRange:range)= async{
         let! navresult = 
@@ -246,14 +232,13 @@ type internal FSharpGoToDefinitionService [<ImportingConstructor>]
         return tryNavigateToItem navresult
     }
 
-
     static member FindDefinition
         (checker: FSharpChecker, documentKey: DocumentId, sourceText: SourceText, filePath: string, position: int,
          defines: string list, options: FSharpProjectOptions, textVersionHash: int) : Option<range> = maybe {
             let textLine = sourceText.Lines.GetLineFromPosition position
             let textLinePos = sourceText.Lines.GetLinePosition position
             let fcsTextLineNumber = Line.fromZ textLinePos.Line
-            let! lexerSymbol = Tokenizer.getSymbolAtPosition(documentKey, sourceText, position, filePath, defines, Tokenizer.SymbolLookupKind.Greedy)
+            let! lexerSymbol = Tokenizer.getSymbolAtPosition(documentKey, sourceText, position, filePath, defines, SymbolLookupKind.Greedy)
             let! _, _, checkFileResults = 
                 checker.ParseAndCheckDocument 
                     (filePath, textVersionHash, sourceText.ToString(), options, allowStaleResults = true)  |> Async.RunSynchronously
@@ -267,7 +252,6 @@ type internal FSharpGoToDefinitionService [<ImportingConstructor>]
             | _ -> return! None
     }
 
-
     /// Construct a task that will return a navigation target for the implementation definition of the symbol 
     /// at the provided position in the document
     member this.FindDefinitionsTask (originDocument:Document, position:int, cancellationToken:CancellationToken) =
@@ -288,7 +272,7 @@ type internal FSharpGoToDefinitionService [<ImportingConstructor>]
                 
             let! lexerSymbol = 
                 Tokenizer.getSymbolAtPosition
-                    (originDocument.Id, sourceText, position,originDocument.FilePath, defines, Tokenizer.SymbolLookupKind.Greedy)
+                    (originDocument.Id, sourceText, position,originDocument.FilePath, defines, SymbolLookupKind.Greedy)
             let idRange = lexerSymbol.Ident.idRange
 
             let! declarations = 
@@ -362,14 +346,11 @@ type internal FSharpGoToDefinitionService [<ImportingConstructor>]
         }   |> Async.map (Option.defaultValue Seq.empty)
             |> RoslynHelpers.StartAsyncAsTask cancellationToken        
 
-   
     interface IGoToDefinitionService with
-        
         // used for 'definition peek'
         member this.FindDefinitionsAsync (document: Document, position: int, cancellationToken: CancellationToken) =
             this.FindDefinitionsTask (document, position, cancellationToken)
 
-
         // used for 'goto definition' proper
         /// Try to navigate to the definiton of the symbol at the symbolRange in the originDocument
         member this.TryGoToDefinition(document: Document, position: int, cancellationToken: CancellationToken) =

vsintegration/tests/unittests/ColorizationServiceTests.fs

@@ -10,7 +10,6 @@ open Microsoft.CodeAnalysis.Classification
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Text
 open Microsoft.VisualStudio.FSharp.Editor
-open RoslynHelpers
 
 [<TestFixture>][<Category "Roslyn Services">]
 type ColorizationServiceTests()  =
@@ -36,7 +35,6 @@ type ColorizationServiceTests()  =
         | None -> Assert.Fail("Cannot find colorization data for end of marker")
         | Some(classifiedSpan) -> Assert.AreEqual(classificationType, classifiedSpan.ClassificationType, "Classification data doesn't match for end of marker")
 
-
     [<Test>]
     member this.Comment_SingleLine() = 
         this.VerifyColorizerAtEndOfMarker(