Various updates on grammar rules and test cases

client/syntaxes/bitbake.tmLanguage.json

@@ -17,9 +17,6 @@
             "end": "(?=\\])",
             "name": "source.python"
         },
-        {
-            "include": "#boolean"
-        },
         {
             "include": "#numeric"
         },
@@ -49,46 +46,59 @@
         "keywords": {
             "patterns": [
                 {
-                    "match": "\\s*(include|from|import|require|inherit|addtask|deltask|after|before|export|echo|if|fi|else|return|unset|print|or|fakeroot|EXPORT_FUNCTIONS|INHERIT)(?=\\s+|\\s*:)",
+                    "match": "\\b(include|require|inherit|addtask|deltask|after|before|export|echo|if|fi|unset|print|fakeroot|EXPORT_FUNCTIONS|INHERIT)\\b",
                     "captures": {
                         "1": {
                             "name": "keyword.control.bb"
                         }
                     }
                 },
                 {
-                    "match": "\\s*(def)(?=\\s+)",
+                    "include": "#python-keywords"
+                },
+                {
+                    "match": "\\s*(python)(?=\\s+|\\s*\\()",
                     "captures": {
                         "1": {
                             "name": "storage.type.function.python.bb"
                         }
                     }
                 },
                 {
-                    "match": "\\s*(python)(?=\\s+|\\s*\\()",
+                    "match": "\\b(bbplain|bb|self)\\b(?=\\s+|\\.)",
                     "captures": {
                         "1": {
-                            "name": "storage.type.function.python.bb"
+                            "name": "support.class.built-in-object.bb"
                         }
                     }
                 },
                 {
-                    "match": "(bbplain|bb|self)(?=\\s+|\\.)",
+                    "match": "(?<=(import|inherit|from)\\s+)([a-zA-Z_][\\w_]*)(?=\\s+)",
+                    "name": "support.class.bb"
+                }
+            ]
+        },
+        "python-keywords": {
+            "patterns": [
+                {
+                    "match": "\\b(if|elif|else|for|while|break|continue|return|yield|try|except|finally|raise|assert|import|from|as|pass|del|with|async|await)\\b",
                     "captures": {
                         "1": {
-                            "name": "support.class.built-in-object.bb"
+                            "name": "keyword.control.bb"
                         }
                     }
                 },
                 {
-                    "begin": "(?<=import|inherit)(?=\\s+)",
-                    "end": "\\n",
-                    "name": "support.class.bb",
-                    "patterns": [
-                        {
-                            "include": "#variable-reference"
+                    "match": "\\b(def|class|global|nonlocal|and|or|not|in|is|lambda)\\b",
+                    "captures": {
+                        "1": {
+                            "name": "storage.type.function.python.bb"
                         }
-                    ]
+                    }
+                },
+                {
+                    "match": "\\b(True|False)\\b",
+                    "name": "constant.language.python.bb"
                 }
             ]
         },
@@ -175,9 +185,6 @@
                 {
                     "include": "#keywords"
                 },
-                {
-                    "include": "#boolean"
-                },
                 {
                     "match": "(\\[)",
                     "name": "meta.embedded.brackets.begin.bb"
@@ -232,10 +239,6 @@
         "parenthesis-close": {
             "match": "\\)",
             "name": "meta.embedded.parenthesis.close.bb"
-        },
-        "boolean": {
-            "match": "(?<![\\w_-])(True|False)(?![\\w_-])",
-            "name": "constant.language.python.bb"
         }
     }
 }

client/test/grammars/snaps/keywords.bb

@@ -1,4 +1,82 @@
-from foo1 import bar1
+# Keywords (Should target bitbake keywords only and exclude python and shell keywords)
+
+python do_foo(){
+  from foo1 import bar1
+
+  if
+
+  whatif
+
+  ifnot
+
+  elif
+
+  else
+
+  for
+
+  while
+
+  break
+
+  continue
+
+  return
+
+  yield
+
+  try
+
+  except
+
+  finally
+
+  raise
+
+  assert
+
+  import
+
+  from
+
+  as
+
+  pass
+
+  del
+
+  with
+
+  async
+
+  await
+
+  def
+
+  class
+
+  global
+
+  nonlocal
+
+  and
+
+  or
+
+  not
+
+  in
+
+  is
+
+  lambda
+
+  self
+
+  True
+
+  False
+}
 
 require foo2
 
@@ -16,24 +94,14 @@ EXPORT_FUNCTIONS functionname
 
 INHERIT += "autotools pkgconfig"
 
-fakeroot python foo() {}
-
 bbplain
 
 bb
 
-self
+fakeroot python foo() {}
 
 def bar3():
   pass
 
-python bar4(){}
-
-
-True
-
-False
-
-def bar2(var1 = True):
-  pass
+python (){}