Merge pull request #746 from auduchinok/lexhelp-keywords

Add wrappers for LexHelp.Keywords
fsharp · Apr 3, 2017 · 0e98fe8 · 0e98fe8
2 parents 1bd4ed3 + d19db74
commit 0e98fe8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/fsharp/vs/ServiceLexing.fs b/src/fsharp/vs/ServiceLexing.fs
@@ -751,6 +751,13 @@ type FSharpSourceTokenizer(defineConstants : string list, filename : Option<stri
         let lexbuf = UnicodeLexing.FunctionAsLexbuf bufferFiller
         FSharpLineTokenizer(lexbuf, None, filename, lexArgsLightOn, lexArgsLightOff)
 
+module Keywords =
+    open Microsoft.FSharp.Compiler.Lexhelp.Keywords
+
+    let QuoteIdentifierIfNeeded s = QuoteIdentifierIfNeeded s
+    let NormalizeIdentifierBackticks s = NormalizeIdentifierBackticks s
+    let KeywordsWithDescription = keywordsWithDescription
+
 [<System.Obsolete("This type has been renamed to FSharpSourceTokenizer")>]
 type SourceTokenizer = FSharpSourceTokenizer
 

diff --git a/src/fsharp/vs/ServiceLexing.fsi b/src/fsharp/vs/ServiceLexing.fsi
@@ -213,5 +213,14 @@ type FSharpSourceTokenizer =
 
 
 module internal TestExpose =     
-    val TokenInfo                                    : Parser.token -> (FSharpTokenColorKind * FSharpTokenCharKind * FSharpTokenTriggerClass) 
+    val TokenInfo : Parser.token -> (FSharpTokenColorKind * FSharpTokenCharKind * FSharpTokenTriggerClass)
 
+module Keywords =
+    /// Add backticks if the identifier is a keyword.
+    val QuoteIdentifierIfNeeded : string -> string
+
+    /// Remove backticks if present.
+    val NormalizeIdentifierBackticks : string -> string
+
+    /// Keywords paired with their descriptions. Used in completion and quick info.
+    val KeywordsWithDescription : (string * string) list