Merge pull request #412 from dsyme/fix-405

Address issues from making Parser and Lexer internal

Author: dsyme

RELEASE_NOTES.md

@@ -1,5 +1,10 @@
+#### 1.4.0.4 - 
+* add more entries to FSharpTokenTag 
+* add PrettyNaming.QuoteIdentifierIfNeeded and PrettyNaming.KeywordNames
+
 #### 1.4.0.3 - 
 * integrate Microsoft/visualfsharp OOB cleanup via fsharp/fsharp
+* Make Parser and Lexer private
 
 #### 1.4.0.2 - 
 * #387 - types and arrays in F# attribute contructor arguments  
@@ -372,3 +377,4 @@
 #### 0.0.2-alpha - 
 * Integrate hosted FSI configuration, SimpleSourceCodeServices, cleanup to SourceCodeServices API
 
+

src/fsharp/vs/ServiceLexing.fs

@@ -27,6 +27,21 @@ type Range = Position * Position
 module FSharpTokenTag = 
     let Identifier = tagOfToken (IDENT "a")
     let String = tagOfToken (STRING "a")
+
+    let IDENT = tagOfToken (IDENT "a")
+    let STRING = tagOfToken (STRING "a")
+    let LPAREN = tagOfToken LPAREN
+    let RPAREN = tagOfToken RPAREN
+    let LBRACK = tagOfToken LBRACK
+    let RBRACK = tagOfToken RBRACK
+    let LBRACE = tagOfToken LBRACE
+    let RBRACE = tagOfToken RBRACE
+    let LBRACK_LESS = tagOfToken LBRACK_LESS
+    let GREATER_RBRACK = tagOfToken GREATER_RBRACK
+    let LESS = tagOfToken (LESS true)
+    let GREATER = tagOfToken (GREATER true)
+    let LBRACK_BAR = tagOfToken LBRACK_BAR
+    let BAR_RBRACK = tagOfToken BAR_RBRACK
 
 /// This corresponds to a token categorization originally used in Visual Studio 2003.
 /// 

src/fsharp/vs/ServiceLexing.fsi

@@ -79,6 +79,34 @@ module FSharpTokenTag =
     val Identifier: int
     /// Indicates the token is a string
     val String : int
+    /// Indicates the token is an identifier (synonym for FSharpTokenTag.Identifer)
+    val IDENT : int
+    /// Indicates the token is an string (synonym for FSharpTokenTag.String)
+    val STRING : int
+    /// Indicates the token is a `(`
+    val LPAREN : int
+    /// Indicates the token is a `)`
+    val RPAREN : int
+    /// Indicates the token is a `[`
+    val LBRACK : int
+    /// Indicates the token is a `]`
+    val RBRACK : int
+    /// Indicates the token is a `{`
+    val LBRACE : int
+    /// Indicates the token is a `}`
+    val RBRACE : int
+    /// Indicates the token is a `[<`
+    val LBRACK_LESS : int
+    /// Indicates the token is a `>]`
+    val GREATER_RBRACK : int
+    /// Indicates the token is a `<`
+    val LESS : int
+    /// Indicates the token is a `>`
+    val GREATER : int
+    /// Indicates the token is a `[|`
+    val LBRACK_BAR : int
+    /// Indicates the token is a `|]`
+    val BAR_RBRACK : int
 
 /// Information about a particular token from the tokenizer
 type FSharpTokenInfo = 

src/fsharp/vs/service.fs

@@ -3225,6 +3225,8 @@ module PrettyNaming =
     let IsLongIdentifierPartCharacter x = Microsoft.FSharp.Compiler.PrettyNaming.IsLongIdentifierPartCharacter x
     let GetLongNameFromString         x = Microsoft.FSharp.Compiler.PrettyNaming.SplitNamesForILPath x
     let FormatAndOtherOverloadsString remainingOverloads = FSComp.SR.typeInfoOtherOverloads(remainingOverloads)
+    let QuoteIdentifierIfNeeded id = Lexhelp.Keywords.QuoteIdentifierIfNeeded id
+    let KeywordNames = Lexhelp.Keywords.keywordNames
 
 //----------------------------------------------------------------------------
 // Obsolete

src/fsharp/vs/service.fsi

@@ -729,9 +729,14 @@ module PrettyNaming =
     val IsIdentifierPartCharacter     : char -> bool
     val IsLongIdentifierPartCharacter : char -> bool
     val GetLongNameFromString         : string -> string list
-    // Temporary workaround for no localized resources in FSharp.LanguageService.dll
+
     val FormatAndOtherOverloadsString : int -> string
 
+    /// A utility to help determine if an identifier needs to be quoted 
+    val QuoteIdentifierIfNeeded : string -> string
+
+    /// All the keywords in the F# langauge 
+    val KeywordNames : string list
 
 [<Obsolete("This type has been renamed to FSharpMethodGroupItemParameter")>]
 /// Renamed to FSharpMethodGroupItemParameter