Jsxtags: shaded brackets in JSX, just like TS does.

analysis/examples/example-project/src/syntax/sample-highlighting.res

@@ -0,0 +1,73 @@
+// Bindings
+let numberBinding = 123
+
+let someFunction = (param: int): int => {
+  let innerBinding = param + 2
+  innerBinding
+}
+
+// Types
+type someRecord<'typeParameter> = {
+  someField: int,
+  someOtherField: string,
+  theParam: typeParameter,
+}
+
+type someEnum =
+  | SomeMember
+  | AnotherMember
+  | SomeMemberWithPayload(someRecord<int>)
+
+type somePolyEnum = [
+  | #someMember
+  | #AnotherMember
+  | #SomeMemberWithPayload(someRecord<int>)
+  | #"fourth Member"
+]
+
+// Destructuring
+let destructuring = () => {
+  let someVar = (1, 2, 3)
+  let (one, two, three) = someVar
+  let someObj: someRecord<int> = {
+    someField: 1,
+    someOtherField: "hello",
+    theParam: 2,
+  }
+  let {someField, someOtherField, theParam} = someObj
+
+  someField
+}
+
+module SomeModule = {
+  type t = Some | Value | Here
+}
+
+// Strings
+let interpolated = `${numberBinding} ${"123"}`
+
+// JSX
+module SomeComponent = {
+  @react.component
+  let make = (
+    ~someProp: int,
+    ~otherProp: string,
+    ~thirdProp: SomeModule.t,
+    ~fourth: somePolyEnum=#"fourth member",
+  ) => {
+    React.null
+  }
+
+  module Nested = {
+    @react.component
+    let make = (~children) => {
+      <> {children} </>
+    }
+  }
+}
+
+let jsx =
+  <div>
+    <SomeComponent someProp=123 otherProp="hello" thirdProp=Value fourth=#AnotherMember />
+    <SomeComponent.Nested> {React.string("Nested")} </SomeComponent.Nested>
+  </div>

analysis/examples/example-project/src/syntax/sample-highlighting.rs

@@ -0,0 +1,31 @@
+// Bindings
+fn some_function(param: usize) -> usize {
+    let innerBinding = param + 2;
+    innerBinding
+}
+
+// Types
+struct someRecord<typeParameter> {
+    someField: usize,
+    someOtherField: String,
+    theParam: typeParameter,
+}
+
+enum someEnum {
+    SomeMember,
+    AnotherMember,
+    SomeMemberWithPayload(someRecord<usize>),
+}
+
+// Destructuring
+fn destructuring() -> usize {
+    let someVar = (1, 2, 3);
+    let (one, two, three) = someVar;
+    let someObj = someRecord::<usize> {
+        someField: 1,
+        someOtherField: String::new("HEllo"),
+        theParam: 2,
+    };
+
+    someObj.someField
+}

analysis/examples/example-project/src/syntax/sample-highlighting.tsx

@@ -0,0 +1,68 @@
+// Bindings
+let numberBinding = 123;
+
+const SomeComp = {
+  Nested: () => null,
+};
+
+let someFunction = (param: number): number => {
+  let innerBinding = param + 2;
+  return innerBinding;
+};
+
+// Types
+type someRecord<typeParameter> = {
+  someField: number;
+  someOtherField: string;
+  theParam: typeParameter;
+};
+
+enum someEnum {
+  SomeMember,
+  AnotherMember,
+}
+
+// Destructuring
+let destructuring = () => {
+  let someVar = [1, 2, 3];
+  let [one, two, three] = someVar;
+  let someObj: someRecord<number> = {
+    someField: 1,
+    someOtherField: "hello",
+    theParam: 2,
+  };
+  let { someField, someOtherField, theParam } = someObj;
+
+  return someField;
+};
+
+namespace SomeModule {
+  export enum t {
+    Some,
+    Value,
+    Here,
+  }
+}
+
+// Strings
+let interpolated = `${numberBinding} ${"123"}`;
+
+// JSX
+interface Props {
+  someProp: number;
+  otherProp: string;
+  thirdProp: SomeModule.t;
+}
+const SomeComponent = ({ someProp, otherProp, thirdProp }: Props) => {
+  return null;
+};
+
+let jsx = (
+  <div>
+    <SomeComponent
+      someProp={123}
+      otherProp="hello"
+      thirdProp={SomeModule.t.Value}
+    />
+  </div>
+);

analysis/src/Cli.ml

@@ -70,6 +70,8 @@ let main () =
       ~col:(int_of_string col)
   | _ :: "dump" :: files -> Commands.dump files
   | [_; "documentSymbol"; path] -> Commands.documentSymbol ~path
+  | [_; "semanticTokens"; currentFile] ->
+    SemanticTokens.testCommand ~currentFile
   | [_; "hover"; path; line; col] ->
     Commands.hover ~path ~line:(int_of_string line) ~col:(int_of_string col)
   | [_; "references"; path; line; col] ->
@@ -83,6 +85,6 @@ let main () =
   | _ ->
     prerr_endline help;
     exit 1
-
 ;;
+
 main ()

analysis/src/Commands.ml

@@ -314,7 +314,6 @@ let test ~path =
             print_endline
               ("Hover " ^ path ^ " " ^ string_of_int line ^ ":"
              ^ string_of_int col);
-
             hover ~path ~line ~col
           | "ref" ->
             print_endline
@@ -331,7 +330,6 @@ let test ~path =
                 ("Rename " ^ path ^ " " ^ string_of_int line ^ ":"
                ^ string_of_int col ^ " " ^ newName)
             in
-
             rename ~path ~line ~col ~newName
           | "com" ->
             print_endline
@@ -349,6 +347,11 @@ let test ~path =
             close_out cout;
             completion ~path ~line ~col ~currentFile;
             Sys.remove currentFile
+          | "par" ->
+            print_endline ("Parse " ^ path);
+            SemanticTokens.parser ~debug:true
+              ~emitter:(SemanticTokens.Token.createEmitter ())
+              ~path
           | _ -> ());
           print_newline ())
     in

analysis/src/ProcessCmt.ml

@@ -1276,10 +1276,8 @@ let rec resolvePath ~env ~path ~package =
       | Some file ->
         resolvePath ~env:(QueryEnv.fromFile file) ~path:fullPath ~package))
 
-let tupleOfLexing {Lexing.pos_lnum; pos_cnum; pos_bol} =
-  (pos_lnum - 1, pos_cnum - pos_bol)
-
-let locationIsBefore {Location.loc_start} pos = tupleOfLexing loc_start <= pos
+let locationIsBefore {Location.loc_start} pos =
+  Utils.tupleOfLexing loc_start <= pos
 
 let findInScope pos name iter stamps =
   (* Log.log("Find " ++ name ++ " with " ++ string_of_int(Hashtbl.length(stamps)) ++ " stamps"); *)