Skip to content

Commit efc11bf

Browse files
committed
Merge pull request #416 from 7sharp9/newtokens
Added new token types to FSharpTokenTag
2 parents e6c0d0a + 5fbd205 commit efc11bf

File tree

2 files changed

+81
-0
lines changed

2 files changed

+81
-0
lines changed

src/fsharp/vs/ServiceLexing.fs

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,33 @@ module FSharpTokenTag =
4242
let GREATER = tagOfToken (GREATER true)
4343
let LBRACK_BAR = tagOfToken LBRACK_BAR
4444
let BAR_RBRACK = tagOfToken BAR_RBRACK
45+
let PLUS_MINUS_OP = tagOfToken (PLUS_MINUS_OP "a")
46+
let MINUS = tagOfToken MINUS
47+
let STAR = tagOfToken STAR
48+
let INFIX_STAR_DIV_MOD_OP = tagOfToken (INFIX_STAR_DIV_MOD_OP "a")
49+
let PERCENT_OP = tagOfToken (PERCENT_OP "a")
50+
let INFIX_AT_HAT_OP = tagOfToken (INFIX_AT_HAT_OP "a")
51+
let QMARK = tagOfToken QMARK
52+
let COLON = tagOfToken COLON
53+
let EQUALS = tagOfToken EQUALS
54+
let SEMICOLON = tagOfToken SEMICOLON
55+
let COMMA = tagOfToken COMMA
56+
let DOT = tagOfToken DOT
57+
let DOT_DOT = tagOfToken DOT_DOT
58+
let INT32_DOT_DOT = tagOfToken (INT32_DOT_DOT(0, true))
59+
let UNDERSCORE = tagOfToken UNDERSCORE
60+
let BAR = tagOfToken BAR
61+
let COLON_GREATER = tagOfToken COLON_GREATER
62+
let COLON_QMARK_GREATER = tagOfToken COLON_QMARK_GREATER
63+
let COLON_QMARK = tagOfToken COLON_QMARK
64+
let INFIX_BAR_OP = tagOfToken (INFIX_BAR_OP "a")
65+
let INFIX_COMPARE_OP = tagOfToken (INFIX_COMPARE_OP "a")
66+
let COLON_COLON = tagOfToken COLON_COLON
67+
let AMP_AMP = tagOfToken AMP_AMP
68+
let PREFIX_OP = tagOfToken (PREFIX_OP "a")
69+
let COLON_EQUALS = tagOfToken COLON_EQUALS
70+
let BAR_BAR = tagOfToken BAR_BAR
71+
let RARROW = tagOfToken RARROW
4572

4673
/// This corresponds to a token categorization originally used in Visual Studio 2003.
4774
///

src/fsharp/vs/ServiceLexing.fsi

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,60 @@ module FSharpTokenTag =
107107
val LBRACK_BAR : int
108108
/// Indicates the token is a `|]`
109109
val BAR_RBRACK : int
110+
/// Indicates the token is a `+` or `-`
111+
val PLUS_MINUS_OP : int
112+
/// Indicates the token is a `-`
113+
val MINUS : int
114+
/// Indicates the token is a `*`
115+
val STAR : int
116+
/// Indicates the token is a `%`
117+
val INFIX_STAR_DIV_MOD_OP : int
118+
/// Indicates the token is a `%`
119+
val PERCENT_OP : int
120+
/// Indicates the token is a `^`
121+
val INFIX_AT_HAT_OP : int
122+
/// Indicates the token is a `?`
123+
val QMARK : int
124+
/// Indicates the token is a `:`
125+
val COLON : int
126+
/// Indicates the token is a `=`
127+
val EQUALS : int
128+
/// Indicates the token is a `;`
129+
val SEMICOLON : int
130+
/// Indicates the token is a `,`
131+
val COMMA : int
132+
/// Indicates the token is a `.`
133+
val DOT : int
134+
/// Indicates the token is a `..`
135+
val DOT_DOT : int
136+
/// Indicates the token is a `..`
137+
val INT32_DOT_DOT : int
138+
/// Indicates the token is a `..`
139+
val UNDERSCORE : int
140+
/// Indicates the token is a `_`
141+
val BAR : int
142+
/// Indicates the token is a `:>`
143+
val COLON_GREATER : int
144+
/// Indicates the token is a `:?>`
145+
val COLON_QMARK_GREATER : int
146+
/// Indicates the token is a `:?`
147+
val COLON_QMARK : int
148+
/// Indicates the token is a `|`
149+
val INFIX_BAR_OP : int
150+
/// Indicates the token is a `|`
151+
val INFIX_COMPARE_OP : int
152+
/// Indicates the token is a `::`
153+
val COLON_COLON : int
154+
/// Indicates the token is a `@@`
155+
val AMP_AMP : int
156+
/// Indicates the token is a `~`
157+
val PREFIX_OP : int
158+
/// Indicates the token is a `:=`
159+
val COLON_EQUALS : int
160+
/// Indicates the token is a `||`
161+
val BAR_BAR : int
162+
/// Indicates the token is a `->`
163+
val RARROW : int
110164

111165
/// Information about a particular token from the tokenizer
112166
type FSharpTokenInfo =

0 commit comments

Comments
 (0)