File tree Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -107,7 +107,8 @@ let emitFromLoc ~loc ~type_ emitter =
107
107
108
108
let emitLongident ?(backwards = false ) ?(jsx = false )
109
109
?(lowerCaseToken = if jsx then Token. JsxLowercase else Token. Variable )
110
- ?(upperCaseToken = Token. Namespace ) ~pos ~lid ~debug emitter =
110
+ ?(upperCaseToken = Token. Namespace ) ?(lastToken = None ) ~pos ~lid ~debug
111
+ emitter =
111
112
let rec flatten acc lid =
112
113
match lid with
113
114
| Longident. Lident txt -> txt :: acc
@@ -119,7 +120,11 @@ let emitLongident ?(backwards = false) ?(jsx = false)
119
120
let rec loop pos segments =
120
121
match segments with
121
122
| [id] when isUppercaseId id || isLowercaseId id ->
122
- let type_ = if isUppercaseId id then upperCaseToken else lowerCaseToken in
123
+ let type_ =
124
+ match lastToken with
125
+ | Some type_ -> type_
126
+ | None -> if isUppercaseId id then upperCaseToken else lowerCaseToken
127
+ in
123
128
if debug then
124
129
Printf. printf " Lident: %s %s %s\n " id (posToString pos)
125
130
(Token. tokenTypeDebug type_);
@@ -170,7 +175,7 @@ let emitRecordLabel ~(label : Longident.t Location.loc) ~debug emitter =
170
175
171
176
let emitVariant ~(name : Longident.t Location.loc ) ~debug emitter =
172
177
emitter
173
- |> emitLongident ~upper CaseToken: Token. EnumMember
178
+ |> emitLongident ~last Token:( Some Token. EnumMember )
174
179
~pos: (Utils. tupleOfLexing name.loc.loc_start)
175
180
~lid: name.txt ~debug
176
181
Original file line number Diff line number Diff line change @@ -123,7 +123,7 @@ JsxTag <: (104,8)
123
123
Lident: ToAsProp (104,9) Namespace
124
124
Variable: true (107,4)->(107,11)
125
125
QuotedIdent: true (108,8) Variable
126
- Ldot: T (110,19) EnumMember
126
+ Ldot: T (110,19) Namespace
127
127
Lident: A (110,21) EnumMember
128
128
Variable: enumInModule (110,4)->(110,16)
129
129
You can’t perform that action at this time.
0 commit comments