massive temp

Author: heyzec

scripts/build.js

@@ -35,8 +35,8 @@ async function build() {
   const url = `https://github.com/mug1wara26/source-lsp/releases/latest/download/${lspFilename}`;
   const outputPath = path.join(outputFolder, lspFilename); // Save in the same directory
   // Function below handles the 302 Found redirection from GitHub
-  await downloadFile(url, outputPath);
-  console.log(`LSP server downloaded from ${url}`);
+  // await downloadFile(url, outputPath);
+  // console.log(`LSP server downloaded from ${url}`);
 }
 
 /**
@@ -52,25 +52,31 @@ function downloadFile(url, outputPath) {
       });
     }
     function onError(err) {
+      console.log(`Error: ${err.message}`);
       fs.unlink(outputPath, () => {
         reject(err);
       });
     }
 
     https
       .get(url, (res) => {
+        console.log(`Response status code: ${res.statusCode}`);
         if (res.statusCode >= 200 && res.statusCode < 300) {
           if (res.statusCode !== 200) {
             console.log("Warn: Status code is not 200");
           }
           onSuccess(res);
-        }
-        if (res.statusCode === 301 || res.statusCode === 302) {
+        } else if (res.statusCode === 301 || res.statusCode === 302) {
+          console.log(`Redirecting to ${res.headers.location}`);
           https
             .get(res.headers.location, (res) => {
+              // TODO: There needs to be second check here
+              console.log(`Response status code: ${res.statusCode}`);
               onSuccess(res);
             })
             .on("error", onError);
+        } else {
+          console.log(`Error: ${res.statusCode}`);
         }
       })
       .on("error", onError);

src/lsp/client.ts

@@ -11,7 +11,7 @@ import {
 import { /* commands, */ window } from "vscode";
 
 let client: LanguageClient;
-// const SECTION = "\u00A7";
+const SECTION = "\u00A7";
 
 export function activateLspClient(context: ExtensionContext) {
   // The server is implemented in node
@@ -51,6 +51,19 @@ export function activateLspClient(context: ExtensionContext) {
   // Start the client. This will also launch the server
   client.start();
 
+  const version = `Source ${SECTION}4`;
+
+  (async function () {
+    try {
+      const response = await client.sendRequest("setLanguageVersion", {
+        version,
+      });
+      window.showInformationMessage(`Language version set to ${version}`);
+    } catch (error) {
+      window.showErrorMessage(`Failed to set language version: ${error}`);
+    }
+  })();
+
   // TODO: Combine this functionality with existing language selector
   // context.subscriptions.push(
   //   commands.registerCommand("sourcejs.setLanguageVersion", async () => {

src/utils/messages.ts

@@ -34,7 +34,7 @@ const Messages = createMessages({
     code,
   }),
   EvalEditor: (workspaceLocation: VscWorkspaceLocation) => ({
-    workspaceLocation: workspaceLocation,
+    workspaceLocation,
   }),
 });
 
@@ -96,6 +96,7 @@ export const MessageTypeNames = (() =>
 // Wrapper functions
 // ================================================================================
 
+// TODO: Rename this as sendToExtension
 /**
  * API to send a Message to the VSC extension.
  * To only be used within source-academy/frontend.

syntaxes/source.tmLanguage.json

@@ -108,6 +108,9 @@
         {
           "include": "#arrow-function"
         },
+        {
+          "include": "#function-call"
+        },
         {
           "include": "#literal"
         },
@@ -180,10 +183,20 @@
       "patterns": [
         {
           "name": "meta.function",
-          "begin": "(function)\\s?\\w+\\(\\w*\\)\\s?\\{",
+          "begin": "(function)\\s?(\\w+)\\((\\w*)\\)\\s?\\{",
           "beginCaptures": {
             "1": {
               "name": "storage.type.function"
+            },
+            "2": {
+              "name": "entity.name.function.js"
+            },
+            "3": {
+              "patterns": [
+                {
+                  "include": "#identifier"
+                }
+              ]
             }
           },
           "end": "}",
@@ -402,6 +415,49 @@
         }
       ]
     },
+    "function-call": {
+      "patterns": [
+        {
+          "name": "meta.function-call.js",
+          "match": "(\\w+)\\((.+)\\)",
+          "captures": {
+            "1": {
+              "name": "entity.name.function.js"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#expression"
+                }
+              ]
+            }
+          }
+        },
+        {
+          "name": "meta.function-call.js",
+          "begin": "(\\w+)(\\()",
+          "beginCaptures": {
+            "0": {
+              "name": "entity.name.function.js"
+            },
+            "1": {
+              "name": "meta.brace.round.ts"
+            }
+          },
+          "end": "\\)",
+          "endCaptures": {
+            "0": {
+              "name": "meta.brace.round.ts"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#expression"
+            }
+          ]
+        }
+      ]
+    },
     "paren-expression": {
       "begin": "\\(",
       "beginCaptures": {

syntaxes/source.tmLanguage.yaml

@@ -57,6 +57,7 @@ repository:
   expression:
     patterns:
       - include: "#arrow-function"
+      - include: "#function-call"
       - include: "#literal"
       - include: "#identifier"
       - include: "#string"
@@ -100,9 +101,11 @@ repository:
   function-declaration:
     patterns:
       - name: meta.function
-        begin: (function)\s?\w+\(\w*\)\s?\{
+        begin: (function)\s?(\w+)\((\w*)\)\s?\{
         beginCaptures:
           "1": { name: storage.type.function }
+          "2": { name: entity.name.function.js }
+          "3": { patterns: [{ include: "#identifier" }] }
         end: "}"
         patterns:
           - include: "#statement"
@@ -203,6 +206,36 @@ repository:
           - include: "#block"
       - name: meta.arrow
 
+  # function-declaration:
+  #   patterns:
+  #     - name: meta.function
+  #       begin: (function)\s?(\w+)\((\w*)\)\s?\{
+  #       beginCaptures:
+  #         "1": { name: storage.type.function }
+  #         "2": { name: entity.name.function.js }
+  #         "3": { patterns: [{ include: "#identifier" }] }
+  #       end: "}"
+  #       patterns:
+  #         - include: "#statement"
+
+  function-call:
+    patterns:
+      - name: meta.function-call.js
+        match: (\w+)\((.+)\)
+        captures:
+          "1": { name: entity.name.function.js }
+          "2": { patterns: [{ include: "#expression" }] }
+      - name: meta.function-call.js
+        begin: (\w+)(\()
+        beginCaptures:
+          "0": { name: entity.name.function.js }
+          "1": { name: meta.brace.round.ts }
+        end: \)
+        endCaptures:
+          "0": { name: meta.brace.round.ts }
+        patterns:
+          - include: "#expression"
+
   paren-expression:
     begin: \(
     beginCaptures: