colorize modules (#2036)

fixed: namespaces are colorized as part of qualified names
dotnet · Dec 17, 2016 · 7b99170 · 7b99170
1 parent 8e07ffe
commit 7b99170
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/fsharp/vs/service.fs b/src/fsharp/vs/service.fs
@@ -1425,6 +1425,13 @@ type TypeCheckInfo
                      | ItemOccurence.Binding _
                      | ItemOccurence.Pattern _), _, _, _, m) ->
                 Some (m, FSharpTokenColorKind.TypeName)
+            | CNR(_, Item.ModuleOrNamespaces refs, 
+                     ( ItemOccurence.UseInType   
+                     | ItemOccurence.UseInAttribute
+                     | ItemOccurence.Use _
+                     | ItemOccurence.Binding _
+                     | ItemOccurence.Pattern _), _, _, _, m) when refs |> List.exists (fun x -> x.IsModule) ->
+                Some (m, FSharpTokenColorKind.TypeName)
             | _ -> None)
         |> Seq.toArray
 

diff --git a/vsintegration/src/FSharp.Editor/Classification/ColorizationService.fs b/vsintegration/src/FSharp.Editor/Classification/ColorizationService.fs
@@ -59,7 +59,7 @@ type internal FSharpColorizationService
                         | FSharpCheckFileAnswer.Aborted -> [| |]
                         | FSharpCheckFileAnswer.Succeeded(results) -> 
                             [| for (range, tokenColorKind)  in results.GetExtraColorizationsAlternate() do
-                                  let span = CommonRoslynHelpers.FSharpRangeToTextSpan(sourceText, range)
+                                  let span = CommonHelpers.fixupSpan(sourceText, CommonRoslynHelpers.FSharpRangeToTextSpan(sourceText, range))
                                   if textSpan.Contains(span.Start) || textSpan.Contains(span.End - 1) || span.Contains(textSpan) then
                                       yield ClassifiedSpan(span, CommonHelpers.compilerTokenToRoslynToken(tokenColorKind)) |]