Merge pull request #1360 from Camc314/cam/dev/control-flow

Adds control flow to theme colors

defaults/settings.toml

@@ -81,6 +81,7 @@ magenta = "#C678DD"
 "method" = "$blue"
 "function.method" = "$blue"
 "keyword" = "$purple"
+"keyword.control" = "$purple"
 "selfKeyword" = "$purple"
 "field" = "$red"
 "property" = "$red"

lapce-core/queries/javascript/highlights.scm

@@ -213,7 +213,6 @@
   "debugger"
   "delete"
   "extends"
-  "from"
   "function"
   "get"
   "in"
@@ -239,7 +238,6 @@
 [
   "switch"
   "case"
-  "default"
   "if"
   "else"
   "yield"
@@ -257,5 +255,7 @@
 
 [
   "import"
+  "default"
+  "from"
   "export"
 ] @keyword.control.import 

lapce-core/queries/jsx/highlights.scm

@@ -176,7 +176,6 @@
   "debugger"
   "delete"
   "extends"
-  "from"
   "function"
   "get"
   "in"
@@ -202,7 +201,6 @@
 [
   "switch"
   "case"
-  "default"
   "if"
   "else"
   "yield"
@@ -220,6 +218,8 @@
 
 [
   "import"
+  "default"
+  "from"
   "export"
 ] @keyword.control.import 
 

lapce-core/queries/typescript/highlights.scm

@@ -227,7 +227,6 @@
   "debugger"
   "delete"
   "extends"
-  "from"
   "function"
   "get"
   "in"
@@ -253,7 +252,6 @@
 [
   "switch"
   "case"
-  "default"
   "if"
   "else"
   "yield"
@@ -271,6 +269,8 @@
 
 [
   "import"
+  "default"
+  "from"
   "export"
 ] @keyword.control.import 
 

lapce-core/src/language.rs

@@ -747,7 +747,7 @@ pub fn from_name(name: &str) -> Option<LapceLanguage> {
         match LapceLanguage::from_str(name.to_lowercase().as_str()) {
             Ok(v) => Some(v),
             Err(e) => {
-                eprintln!("failed parsing LapceLanguage: {e}");
+                eprintln!("failed parsing {name} LapceLanguage: {e}");
                 None
             }
         }

lapce-core/src/style.rs

@@ -14,6 +14,7 @@
     "function",
     "label",
     "keyword",
+    "keyword.control",
     "string",
     "variable",
     "variable.other.member",