Merge branch 'master' into code-actions

Author: zth

.github/workflows/ci.yml

@@ -77,3 +77,58 @@ jobs:
       with:
         name: ${{matrix.os}}
         path: analysis/binary.tar
+
+  package:
+    needs: test
+    runs-on: ubuntu-18.04
+  
+    steps:
+    - uses: actions/[email protected]
+    
+    - name: Use Node.js
+      uses: actions/[email protected]
+      with:
+        node-version: 14.4.0
+
+    - run: npm ci
+    - run: npm run compile
+    
+    - name: Download MacOS binary
+      uses: actions/[email protected]
+      with:
+        name: macos-latest
+        path: ./server/analysis_binaries
+    - run: tar -xvf binary.tar
+      working-directory: ./server/analysis_binaries
+
+    - name: Download Linux binary
+      uses: actions/[email protected]
+      with:
+        name: ubuntu-18.04
+        path: ./server/analysis_binaries
+    - run: tar -xvf binary.tar
+      working-directory: ./server/analysis_binaries
+
+    - name: Download Windows binary
+      uses: actions/[email protected]
+      with:
+        name: windows-latest
+        path: ./server/analysis_binaries
+    - run: tar -xvf binary.tar
+      working-directory: ./server/analysis_binaries
+
+    - name: Cleanup tar file
+      run: rm binary.tar
+      working-directory: ./server/analysis_binaries
+
+    - name: Store short commit SHA for filename
+      id: vars
+      run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+      
+    - name: Package Extension
+      run: npx vsce package -o rescript-vscode-${{ steps.vars.outputs.sha_short }}.vsix
+      
+    - uses: actions/upload-artifact@v2
+      with:
+        name: rescript-vscode-${{ steps.vars.outputs.sha_short }}.vsix
+        path: rescript-vscode-${{ steps.vars.outputs.sha_short }}.vsix

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Use semantic syntax highlighting (https://github.com/rescript-lang/rescript-vscode/pull/367).
 - Report "Fatal error" when it happens in the compiler log (e.g. a make function with type annotation) and don't crash the extension.
 - Fix issue in functions the form "~foo as name" where the location would only cover "ame".
+- Extend the command to create an interface file, to support components and ReScript decorators used in bindings.
 
 ## 1.2.1
 

analysis/src/Cli.ml

@@ -48,9 +48,13 @@ Options:
 
     ./rescript-editor-analysis.exe rename src/MyFile.res 10 2 foo
 
-  dump: for debugging, show all definitions and hovers for MyFile.res and MyFile.res:
+  semanticTokens: return token semantic highlighting info for MyFile.res
 
-    ./rescript-editor-analysis.exe dump src/Foo.res src/MyFile.res
+    ./rescript-editor-analysis.exe semanticTokens src/MyFile.res
+
+  createInterface: print to stdout the interface file for src/MyFile.res
+
+    ./rescript-editor-analysis.exe createInterface src/MyFile.res lib/bs/src/MyFile.cmi
 
   test: run tests specified by special comments in file src/MyFile.res
 
@@ -68,10 +72,7 @@ let main () =
   | [_; "typeDefinition"; path; line; col] ->
     Commands.typeDefinition ~path ~line:(int_of_string line)
       ~col:(int_of_string col)
-  | _ :: "dump" :: files -> Commands.dump files
   | [_; "documentSymbol"; path] -> Commands.documentSymbol ~path
-  | [_; "semanticTokens"; currentFile] ->
-    SemanticTokens.semanticTokens ~currentFile
   | [_; "hover"; path; line; col] ->
     Commands.hover ~path ~line:(int_of_string line) ~col:(int_of_string col)
   | [_; "codeAction"; path; line; col; currentFile] ->
@@ -83,6 +84,11 @@ let main () =
   | [_; "rename"; path; line; col; newName] ->
     Commands.rename ~path ~line:(int_of_string line) ~col:(int_of_string col)
       ~newName
+  | [_; "semanticTokens"; currentFile] ->
+    SemanticTokens.semanticTokens ~currentFile
+  | [_; "createInterface"; path; cmiFile] ->
+    Printf.printf "\"%s\""
+      (Json.escape (CreateInterface.command ~path ~cmiFile))
   | [_; "test"; path] -> Commands.test ~path
   | args when List.mem "-h" args || List.mem "--help" args -> prerr_endline help
   | _ ->

analysis/src/Commands.ml

@@ -1,37 +1,5 @@
 open SharedTypes
 
-let dumpLocations ~full =
-  full.extra.locItems
-  |> List.map (fun locItem ->
-         let locItemTxt = locItemToString locItem in
-         let hoverText = Hover.newHover ~full locItem in
-         let hover =
-           match hoverText with None -> "" | Some s -> String.escaped s
-         in
-         let uriLocOpt = References.definitionForLocItem ~full locItem in
-         let def =
-           match uriLocOpt with
-           | None -> Protocol.null
-           | Some (uri2, loc) ->
-             Protocol.stringifyLocation
-               {uri = Uri2.toString uri2; range = Utils.cmtLocToRange loc}
-         in
-         Protocol.stringifyRange (Utils.cmtLocToRange locItem.loc)
-         ^ "\n  Hover: " ^ hover ^ "\n  Definition: " ^ def ^ "\n locItem: "
-         ^ locItemTxt)
-  |> String.concat "\n\n"
-
-let dump files =
-  Shared.cacheTypeToString := true;
-  files
-  |> List.iter (fun path ->
-         let result =
-           match Cmt.fromPath ~path with
-           | None -> "[]"
-           | Some full -> dumpLocations ~full
-         in
-         print_endline result)
-
 let completion ~path ~line ~col ~currentFile =
   let pos = (line, col) in
   let result =
@@ -376,6 +344,16 @@ let test ~path =
                                  Printf.printf "%s\nnewText:\n%s<--here\n%s%s\n"
                                    (Protocol.stringifyRange range)
                                    indent indent newText)))
+          | "int" ->
+            print_endline ("Create Interface " ^ path);
+            let cmiFile =
+              let open Filename in
+              let ( ++ ) = concat in
+              let name = chop_extension (basename path) ^ ".cmi" in
+              let dir = dirname path in
+              dir ++ parent_dir_name ++ "lib" ++ "bs" ++ "src" ++ name
+            in
+            Printf.printf "%s" (CreateInterface.command ~path ~cmiFile)
           | _ -> ());
           print_newline ())
     in