[nongnu] elpa/dart-mode bbeadaa 181/192: Reorganize some keyword fontification

[ELPA Syncer]

branch: elpa/dart-mode
commit bbeadaadff3810da2ab7a7159a3d9e268a39ea3d
Author: Brady Trainor <mail@bradyt.com>
Commit: Brady Trainor <mail@bradyt.net>

    Reorganize some keyword fontification
    
    - Move mixin from keywords to builtins
    - Add covariant, Function, interface to builtins
    - Remove hide, of, show from builtins
---
 dart-mode.el                             | 12 ++++++------
 test/faceup/issues/covariant.dart.faceup |  2 +-
 test/test.el                             |  1 -
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dart-mode.el b/dart-mode.el
index 616c340..edffa20 100644
--- a/dart-mode.el
+++ b/dart-mode.el
@@ -102,19 +102,19 @@ indentation levels from right to left."
 (defvar dart--builtins
   ;; ECMA 408; Section: Identifier Reference
   ;; "Built-in identifiers"
-  '("abstract" "as" "deferred" "dynamic" "export" "external" "hide"
-    "factory" "get" "implements" "import" "library" "of" "operator"
-    "part" "set" "show" "static" "typedef"))
+  '("abstract" "as" "covariant" "deferred" "dynamic" "export"
+    "external" "factory" "Function" "get" "implements" "import"
+    "interface" "library" "mixin" "operator" "part" "set" "static"
+    "typedef"))
 
 (defvar dart--keywords
   ;; ECMA 408; Section: Reserved Words
   '("assert" "break" "case" "catch" "class" "const" "continue"
     "default" "do" "else" "enum" "extends" "final" "finally" "for"
     "if" "in" "is" "new" "rethrow" "return" "super" "switch" "this"
-    "throw" "try" "var" "while" "with" "mixin"))
-;; mixin is not part of ECMA 408 but it's used in dart.
+    "throw" "try" "var" "while" "with"))
 
-(defvar dart--types '("bool" "double" "dynamic" "int" "num" "void"))
+(defvar dart--types '("bool" "double" "int" "num" "void"))
 
 (defvar dart--constants '("false" "null" "true"))
 
diff --git a/test/faceup/issues/covariant.dart.faceup 
b/test/faceup/issues/covariant.dart.faceup
index 1008b1d..67be360 100644
--- a/test/faceup/issues/covariant.dart.faceup
+++ b/test/faceup/issues/covariant.dart.faceup
@@ -1,3 +1,3 @@
 «k:class» «t:Cat» «k:extends» «t:Animal» {
-  «t:void» «f:chase»(«k:covariant» «t:Mouse» «v:x») { ... }
+  «t:void» «f:chase»(«b:covariant» «t:Mouse» «v:x») { ... }
 }
diff --git a/test/test.el b/test/test.el
index 88fefce..a2b029e 100644
--- a/test/test.el
+++ b/test/test.el
@@ -27,7 +27,6 @@
   (should (dart-font-lock-test-apps "faceup/issues/abstract-methods.dart")))
 
 (ert-deftest dart-font-lock-covariant-test ()
-  :expected-result :failed
   (should (dart-font-lock-test-apps "faceup/issues/covariant.dart")))
 
 (ert-deftest dart-font-lock-declared-operators-test ()