Hipster themes are more into class than namespace.

Author: cristianoc

analysis/src/SemanticTokens.ml

@@ -24,7 +24,7 @@ module Token = struct
     | Variable  (** let x = *)
     | Type  (** type t = *)
     | JsxTag  (** the < and > in <div> *)
-    | Namespace  (** module M = *)
+    | Class  (** module M = *)
     | EnumMember  (** variant A or poly variant #A *)
     | Property  (** {x:...} *)
     | JsxLowercase  (** div in <div> *)
@@ -36,7 +36,7 @@ module Token = struct
     | Variable -> "1"
     | Type -> "2"
     | JsxTag -> "3"
-    | Namespace -> "4"
+    | Class -> "4"
     | EnumMember -> "5"
     | Property -> "6"
     | JsxLowercase -> "7"
@@ -46,7 +46,7 @@ module Token = struct
     | Variable -> "Variable"
     | Type -> "Type"
     | JsxTag -> "JsxTag"
-    | Namespace -> "Namespace"
+    | Class -> "Class"
     | EnumMember -> "EnumMember"
     | Property -> "Property"
     | JsxLowercase -> "JsxLowercase"
@@ -124,8 +124,8 @@ let emitFromLoc ~loc ~type_ emitter =
 
 let emitLongident ?(backwards = false) ?(jsx = false)
     ?(lowerCaseToken = if jsx then Token.JsxLowercase else Token.Variable)
-    ?(upperCaseToken = Token.Namespace) ?(lastToken = None) ?(posEnd = None)
-    ~pos ~lid ~debug emitter =
+    ?(upperCaseToken = Token.Class) ?(lastToken = None) ?(posEnd = None) ~pos
+    ~lid ~debug emitter =
   let rec flatten acc lid =
     match lid with
     | Longident.Lident txt -> txt :: acc

analysis/tests/src/expected/Parser.res.txt

@@ -1,14 +1,14 @@
 Parse tests/src/Parser.res
 structure items:38 diagnostics:0 
-Lident: M (0,7) Namespace
-Lident: C (1,9) Namespace
-Lident: Component (1,13) Namespace
+Lident: M (0,7) Class
+Lident: C (1,9) Class
+Lident: Component (1,13) Class
 JsxTag <: (4,9)
-Lident: Component (4,10) Namespace
+Lident: Component (4,10) Class
 Variable: _c (4,4)->(4,6)
 JsxTag <: (6,10)
-Ldot: M (6,11) Namespace
-Lident: C (6,13) Namespace
+Ldot: M (6,11) Class
+Lident: C (6,13) Class
 Variable: _mc (6,4)->(6,7)
 JsxTag <: (8,9)
 Lident: div (8,10) JsxLowercase
@@ -18,18 +18,18 @@ Lident: div (11,3) JsxLowercase
 Lident: div (16,4) JsxLowercase
 JsxTag >: (11,6)
 JsxTag >: (16,7)
-Ldot: React (12,5) Namespace
+Ldot: React (12,5) Class
 Lident: string (12,11) Variable
 JsxTag <: (13,4)
 Lident: div (13,5) JsxLowercase
 Lident: div (13,34) JsxLowercase
 JsxTag >: (13,8)
 JsxTag >: (13,37)
-Ldot: React (13,11) Namespace
+Ldot: React (13,11) Class
 Lident: string (13,17) Variable
-Ldot: React (14,5) Namespace
+Ldot: React (14,5) Class
 Lident: string (14,11) Variable
-Ldot: React (15,5) Namespace
+Ldot: React (15,5) Class
 Lident: string (15,11) Variable
 Variable: _d2 (10,4)->(10,7)
 Lident: pair (18,5) Type
@@ -48,19 +48,19 @@ Lident: looooooooooooooooooooooooooooooooooooooong_string (27,4) Type
 Binary operator < (31,12)->(31,13)
 Binary operator > (31,22)->(31,23)
 Lident: MT (33,12) Type
-Lident: DDF (34,9) Namespace
-Lident: DDF (39,7) Namespace
+Lident: DDF (34,9) Class
+Lident: DDF (39,7) Class
 Lident: MT (39,12) Type
-Lident: DDF (40,9) Namespace
-Lident: XX (45,7) Namespace
-Lident: YY (46,9) Namespace
+Lident: DDF (40,9) Class
+Lident: XX (45,7) Class
+Lident: YY (46,9) Class
 Lident: t (47,9) Type
 Lident: int (47,13) Type
-Ldot: XX (51,5) Namespace
-Lident: YY (51,8) Namespace
+Ldot: XX (51,5) Class
+Lident: YY (51,8) Class
 Lident: tt (53,5) Type
 Lident: t (53,10) Type
-Lident: T (57,7) Namespace
+Lident: T (57,7) Class
 Lident: someRecord (58,7) Type
 Lident: someField (59,4) Property
 Lident: int (59,15) Type
@@ -71,7 +71,7 @@ Lident: someEnum (64,7) Type
 Lident: A (64,18) EnumMember
 Lident: B (64,22) EnumMember
 Lident: C (64,26) EnumMember
-Ldot: T (67,17) Namespace
+Ldot: T (67,17) Class
 Lident: someField (67,19) Property
 Lident: x (67,15) Variable
 Variable: x (67,10)->(67,11)
@@ -89,16 +89,16 @@ JsxTag >: (73,24)
 JsxTag >: (73,39)
 JsxTag <: (73,26)
 Lident: div (73,27) JsxLowercase
-Lident: SomeComponent (75,7) Namespace
-Lident: Nested (76,9) Namespace
+Lident: SomeComponent (75,7) Class
+Lident: Nested (76,9) Class
 Lident: children (79,10) Variable
 Variable: children (78,16)->(78,25)
 Variable: make (78,8)->(78,12)
 JsxTag <: (84,8)
-Ldot: SomeComponent (84,9) Namespace
-Lident: Nested (84,23) Namespace
-Ldot: SomeComponent (84,41) Namespace
-Lident: Nested (84,55) Namespace
+Ldot: SomeComponent (84,9) Class
+Lident: Nested (84,23) Class
+Ldot: SomeComponent (84,41) Class
+Lident: Nested (84,55) Class
 JsxTag >: (84,29)
 JsxTag >: (84,61)
 JsxTag <: (84,31)
@@ -113,29 +113,29 @@ Lident: to (94,20) Variable
 Lident: to (94,25) Variable
 Lident: to (94,9) Variable
 Lident: to (94,14) Variable
-Lident: ToAsProp (98,7) Namespace
+Lident: ToAsProp (98,7) Class
 Lident: to (101,18) Variable
-Ldot: React (101,8) Namespace
+Ldot: React (101,8) Class
 Lident: int (101,14) Variable
 Variable: to (100,14)->(100,17)
 Variable: make (100,6)->(100,10)
 JsxTag <: (104,8)
-Lident: ToAsProp (104,9) Namespace
+Lident: ToAsProp (104,9) Class
 Variable: true (107,4)->(107,11)
 Lident: true (108,8)->(108,15) Variable
-Ldot: T (110,19) Namespace
+Ldot: T (110,19) Class
 Lident: A (110,21) EnumMember
 Variable: enumInModule (110,4)->(110,16)
 Lident: typeInModule (112,5) Type
-Ldot: XX (112,20) Namespace
-Ldot: YY (112,23) Namespace
+Ldot: XX (112,20) Class
+Ldot: YY (112,23) Class
 Lident: t (112,26) Type
-Lident: QQ (114,7) Namespace
+Lident: QQ (114,7) Class
 Lident: somePolyEnumType (115,7) Type
 Lident: list (118,29) Type
 TypeArg: (118,34)->(118,37)
 Lident: int (118,34) Type
-Ldot: QQ (126,8) Namespace
+Ldot: QQ (126,8) Class
 Lident: somePolyEnumType (126,11) Type
 Lident: x (124,9) Variable
 Variable: x (123,8)->(123,9)

server/src/server.ts

@@ -765,7 +765,7 @@ function onMessage(msg: m.Message) {
                 "variable",
                 "type",
                 "jsx-tag",
-                "namespace",
+                "class",
                 "enumMember",
                 "property",
                 "jsx-lowercase",