Merge pull request #993 from otawfik-ms/correcthistory

Added Colorization/Brace Matching Roslyn Services

Author: Omar Tawfik

src/fsharp/lexhelp.fs

@@ -2,6 +2,8 @@
 
 module internal Microsoft.FSharp.Compiler.Lexhelp
 
+open System
+open System.IO
 open System.Text
 open Internal.Utilities
 open Internal.Utilities.Collections
@@ -335,14 +337,18 @@ module Keywords =
             match s with 
             | "__SOURCE_DIRECTORY__" ->
                 let filename = fileOfFileIndex lexbuf.StartPos.FileIndex
-                let dirname  = if filename = stdinMockFilename then
-                                   System.IO.Directory.GetCurrentDirectory()
-                               else
-                                   filename |> FileSystem.GetFullPathShim (* asserts that path is already absolute *)
-                                            |> System.IO.Path.GetDirectoryName
+                let dirname  =
+                    if String.IsNullOrWhiteSpace(filename) then
+                        String.Empty
+                    else if filename = stdinMockFilename then
+                        Directory.GetCurrentDirectory()
+                    else
+                        filename
+                        |> FileSystem.GetFullPathShim (* asserts that path is already absolute *)
+                        |> Path.GetDirectoryName
                 KEYWORD_STRING dirname
             | "__SOURCE_FILE__" -> 
-               KEYWORD_STRING (System.IO.Path.GetFileName((fileOfFileIndex lexbuf.StartPos.FileIndex))) 
+               KEYWORD_STRING (Path.GetFileName((fileOfFileIndex lexbuf.StartPos.FileIndex))) 
             | "__LINE__" -> 
                KEYWORD_STRING (string lexbuf.StartPos.Line)
             | _ -> 

src/fsharp/vs/ServiceLexing.fs

@@ -88,9 +88,7 @@ type FSharpTokenColorKind =
     | PreprocessorKeyword = 8
     | Number = 9
     | Operator = 10
-#if COLORIZE_TYPES
     | TypeName = 11
-#endif
 
 /// Categorize an action the editor should take in response to a token, e.g. brace matching
 /// 
@@ -477,15 +475,17 @@ type SingleLineTokenState =
 [<Sealed>]
 type FSharpLineTokenizer(lexbuf: UnicodeLexing.Lexbuf, 
                             maxLength: int option,
-                            filename : string, 
+                            filename : Option<string>, 
                             lexArgsLightOn : lexargs,
                             lexArgsLightOff : lexargs
                             ) = 
 
     let skip = false   // don't skip whitespace in the lexer 
 
     let mutable singleLineTokenState = SingleLineTokenState.BeforeHash
-    let fsx = CompileOps.IsScript(filename)
+    let fsx = match filename with
+              | None -> false
+              | Some(value) -> CompileOps.IsScript(value)
 
     // ----------------------------------------------------------------------------------
     // This implements post-processing of #directive tokens - not very elegant, but it works...
@@ -552,7 +552,9 @@ type FSharpLineTokenizer(lexbuf: UnicodeLexing.Lexbuf,
 
 
 
-    do resetLexbufPos filename lexbuf 
+    do match filename with 
+       | None -> lexbuf.EndPos <- Internal.Utilities.Text.Lexing.Position.Empty
+       | Some(value) -> resetLexbufPos value lexbuf
 
     member x.ScanToken(lexintInitial) : Option<FSharpTokenInfo> * FSharpTokenizerLexState = 
         use unwindBP = PushThreadBuildPhaseUntilUnwind (BuildPhase.Parse)
@@ -736,7 +738,7 @@ type FSharpLineTokenizer(lexbuf: UnicodeLexing.Lexbuf,
         LexerStateEncoding.encodeLexCont colorState ncomments position ifdefStack light
 
 [<Sealed>]
-type FSharpSourceTokenizer(defineConstants : string list, filename : string) =     
+type FSharpSourceTokenizer(defineConstants : string list, filename : Option<string>) =     
     let lexResourceManager = new Lexhelp.LexResourceManager() 
 
     let lexArgsLightOn = mkLexargs(filename,defineConstants,LightSyntaxStatus(true,false),lexResourceManager, ref [],DiscardErrorsLogger) 

src/fsharp/vs/ServiceLexing.fsi

@@ -15,6 +15,9 @@ open System.Collections.Generic
 open Microsoft.FSharp.Compiler 
 open Microsoft.FSharp.Compiler.Range
 
+type Position = int * int
+type Range = Position * Position
+
 /// Represents encoded information for the end-of-line continutation of lexing
 type FSharpTokenizerLexState = int64
 
@@ -49,9 +52,7 @@ type internal FSharpTokenColorKind =
     | PreprocessorKeyword = 8
     | Number = 9
     | Operator = 10
-#if COLORIZE_TYPES
     | TypeName = 11
-#endif
 
 /// Gives an indication of what should happen when the token is typed in an IDE
 type internal FSharpTokenTriggerClass =
@@ -205,7 +206,7 @@ type internal FSharpLineTokenizer =
 /// Tokenizer for a source file. Holds some expensive-to-compute resources at the scope of the file.
 [<Sealed>]
 type internal FSharpSourceTokenizer =
-    new : conditionalDefines:string list * fileName:string -> FSharpSourceTokenizer
+    new : conditionalDefines:string list * fileName:Option<string> -> FSharpSourceTokenizer
     member CreateLineTokenizer : lineText:string -> FSharpLineTokenizer
     member CreateBufferTokenizer : bufferFiller:(char[] * int * int -> int) -> FSharpLineTokenizer
 

src/fsharp/vs/service.fs

@@ -1473,12 +1473,10 @@ type TypeCheckInfo
                // custom builders, custom operations get colored as keywords
                | CNR(_, (Item.CustomBuilder _ | Item.CustomOperation _), ItemOccurence.Use, _, _, _, m) -> 
                    yield (m, FSharpTokenColorKind.Keyword) 
-#if COLORIZE_TYPES
                // types get colored as types when they occur in syntactic types or custom attributes
                // typevariables get colored as types when they occur in syntactic types custom builders, custom operations get colored as keywords
                | CNR(_, (Item.TypeVar  _ | Item.Types _ | Item.UnqualifiedType _) , (ItemOccurence.UseInType | ItemOccurence.UseInAttribute), _, _, _, m) -> 
                    yield (m, FSharpTokenColorKind.TypeName) 
-#endif
                | _ -> () 
            |]
     member x.ScopeResolutions = sResolutions

src/fsharp/vs/service.fsi

@@ -519,6 +519,9 @@ type internal FSharpChecker =
     /// This function is called when the configuration is known to have changed for reasons not encoded in the ProjectOptions.
     /// For example, dependent references may have been deleted or created.
     member InvalidateConfiguration: options: FSharpProjectOptions -> unit    
+    
+    /// Begin background parsing the given project.
+    member StartBackgroundCompile: options: FSharpProjectOptions -> unit
 
     /// Set the project to be checked in the background.  Overrides any previous call to <c>CheckProjectInBackground</c>
     member CheckProjectInBackground: options: FSharpProjectOptions -> unit

vsintegration/src/FSharp.Editor/BraceCompletion.fs

@@ -22,14 +22,15 @@
     <OtherFlags>$(OtherFlags) --warnon:1182  --subsystemversion:6.00</OtherFlags>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="TokenContext.fs" />
+    <Compile Include="InternalsVisibleTo.fs" />
     <Compile Include="SmartIndent.fs" />
+    <Compile Include="FSharpProjectSiteService.fs" />
+    <Compile Include="FSharpContentType.fs" />
+    <Compile Include="FSharpColorizationService.fs" />
+    <Compile Include="FSharpBraceMatchingService.fs" />
     <Content Include="extension.vsixmanifest">
       <CopyToOutputDirectory>false</CopyToOutputDirectory>
     </Content>
-    <Compile Include="BraceCompletion.fs" />
-    <Compile Include="FSharpProjectSiteService.fs" />
-    <Compile Include="FSharpContentType.fs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\fsharp\FSharp.Core\FSharp.Core.fsproj">
@@ -64,10 +65,13 @@
     <Reference Include="Microsoft.VisualStudio.Text.Logic" />
     <Reference Include="Microsoft.VisualStudio.CoreUtility" />
     <Reference Include="Microsoft.VisualStudio.OLE.Interop" />
-    <Reference Include="Microsoft.VisualStudio.Shell" />
+    <Reference Include="Microsoft.VisualStudio.Shell.$(VisualStudioVersion)" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop" />
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />
+    <Reference Include="Microsoft.VisualStudio.Threading" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="WindowsBase" />
     <Reference Include="System.Composition.AttributedModel">
       <HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
     </Reference>