[llvm] e3ed63e - [TableGen] Update editor modes for new keywords.

[Simon Tatham via llvm-commits]

Author: Simon Tatham
Date: 2020-01-14T13:39:00Z
New Revision: e3ed63e83ab6194aaf6711b97bdf09f16dcf2401

URL: https://github.com/llvm/llvm-project/commit/e3ed63e83ab6194aaf6711b97bdf09f16dcf2401
DIFF: https://github.com/llvm/llvm-project/commit/e3ed63e83ab6194aaf6711b97bdf09f16dcf2401.diff

LOG: [TableGen] Update editor modes for new keywords.

Summary:
D71407 and D71474 added new keywords to the Tablegen language:
`defvar`, `if`, `then` and `else`. This commit updates the various
editor modes to highlight them appropriately.

Some of the modes also didn't include `defset`, so I've added that too
while I was there.

Reviewers: MaskRay, lebedev.ri, plotfi

Reviewed By: lebedev.ri

Subscribers: llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D72693

Added: 
    

Modified: 
    llvm/utils/emacs/tablegen-mode.el
    llvm/utils/kate/llvm-tablegen.xml
    llvm/utils/vim/syntax/tablegen.vim
    llvm/utils/vscode/tablegen/syntaxes/TableGen.tmLanguage

Removed: 
    


################################################################################
diff  --git a/llvm/utils/emacs/tablegen-mode.el b/llvm/utils/emacs/tablegen-mode.el
index a5da0fdac5a5..572823fa56e1 100644
--- a/llvm/utils/emacs/tablegen-mode.el
+++ b/llvm/utils/emacs/tablegen-mode.el
@@ -18,7 +18,8 @@
 
 (defvar tablegen-font-lock-keywords
   (let ((kw (regexp-opt '("class" "defm" "def" "field" "include" "in"
-                         "let" "multiclass" "foreach")
+                         "let" "multiclass" "foreach" "if" "then" "else"
+                         "defvar" "defset")
                         'words))
         (type-kw (regexp-opt '("bit" "bits" "code" "dag" "int" "list" "string")
                              'words))

diff  --git a/llvm/utils/kate/llvm-tablegen.xml b/llvm/utils/kate/llvm-tablegen.xml
index df9507fc92f1..2a3f04032366 100644
--- a/llvm/utils/kate/llvm-tablegen.xml
+++ b/llvm/utils/kate/llvm-tablegen.xml
@@ -5,6 +5,9 @@
     <list name="keywords">
       <item> foreach </item>
       <item> field </item>
+      <item> if </item>
+      <item> then </item>
+      <item> else </item>
     </list>
     <list name="operator-keywords">
       <item> in </item>
@@ -45,6 +48,7 @@
       <item> defm </item>
       <item> defset </item>
       <item> let </item>
+      <item> defvar </item>
       <item> multiclass </item>
     </list>
     <list name="class-like">

diff  --git a/llvm/utils/vim/syntax/tablegen.vim b/llvm/utils/vim/syntax/tablegen.vim
index a9b0e4e3a4e7..341c8bef28b2 100644
--- a/llvm/utils/vim/syntax/tablegen.vim
+++ b/llvm/utils/vim/syntax/tablegen.vim
@@ -14,7 +14,7 @@ syntax sync minlines=100
 
 syn case match
 
-syn keyword tgKeyword   def let in code dag field include defm foreach
+syn keyword tgKeyword   def let in code dag field include defm foreach defset defvar if then else
 syn keyword tgType      class int string list bit bits multiclass
 
 syn match   tgNumber    /\<\d\+\>/

diff  --git a/llvm/utils/vscode/tablegen/syntaxes/TableGen.tmLanguage b/llvm/utils/vscode/tablegen/syntaxes/TableGen.tmLanguage
index f3cf2d618fd5..0b08ec262a1a 100644
--- a/llvm/utils/vscode/tablegen/syntaxes/TableGen.tmLanguage
+++ b/llvm/utils/vscode/tablegen/syntaxes/TableGen.tmLanguage
@@ -18,7 +18,7 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b(def|let|in|code|dag|string|list|bits|bit|field|include|defm|foreach|class|multiclass|int)\b</string>
+			<string>\b(def|let|in|code|dag|string|list|bits|bit|field|include|defm|foreach|class|multiclass|int|defvar|defset|if|then|else)\b</string>
 			<key>name</key>
 			<string>keyword.control.tablegen</string>
 		</dict>