Updatev4.1.2

1 files changed, 27 insertions, 26 deletions

diff --git a/syntax/dart.vim b/syntax/dart.vim
index 797e684b..103b1da2 100644
--- a/syntax/dart.vim
+++ b/syntax/dart.vim
@@ -28,7 +28,7 @@ syntax keyword dartConstant       null
 syntax keyword dartTypedef        this super class typedef enum mixin
 syntax keyword dartOperator       new is as in
 syntax match   dartOperator       "+=\=\|-=\=\|*=\=\|/=\=\|%=\=\|\~/=\=\|<<=\=\|>>=\=\|[<>]=\=\|===\=\|\!==\=\|&=\=\|\^=\=\||=\=\|||\|&&\|\[\]=\=\|=>\|!\|\~\|?\|:"
-syntax keyword dartType           void var bool int double num dynamic
+syntax keyword dartCoreType       void var dynamic
 syntax keyword dartStatement      return
 syntax keyword dartStorageClass   static abstract final const factory
 syntax keyword dartExceptions     throw rethrow try on catch finally
@@ -51,27 +51,26 @@ syntax match   dartLibrary       "^\(library\|part of\|part\)\>"
 syntax match   dartMetadata      "@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>"
 
 " Numbers
-syntax match dartNumber         "\<\d\+\(\.\d\+\)\=\>"
+syntax match   dartNumber        "\<\d\+\(\.\d\+\)\=\>"
 
 " User Types
-if !exists('dart_highlight_types') || dart_highlight_types
-  syntax match dartTypeName   "\<[A-Z]\w*\>\|\<_[A-Z]\w*\>"
-endif
-
-" Core libraries
-if !exists('dart_corelib_highlight') || dart_corelib_highlight
-  syntax keyword dartCoreClasses BidirectionalIterator Comparable DateTime
-      \ Duration Expando Function Invocation Iterable Iterator List Map Match
-      \ Object Pattern RegExp RuneIterator Runes Set StackTrace Stopwatch String
-      \ StringBuffer StringSink Symbol Type
-  syntax keyword dartCoreTypedefs   Comparator
-  syntax keyword dartCoreExceptions AbstractClassInstantiationError
-      \ ArgumentError AssertionError CastError ConcurrentModificationError
-      \ Error Exception FallThroughError FormatException
-      \ IntegerDivisionByZeroException NoSuchMethodError NullThrownError
-      \ OutOfMemoryError RangeError RuntimeError StackOverflowError StateError
-      \ TypeError UnimplementedError UnsupportedError
-endif
+syntax match   dartUserType      "\<_\?\u[[:alnum:]_\$]*\>"
+
+" Function highlighting
+syntax match   dartFunction      "\zs\<\(_\?\l[[:alnum:]_\$]*\)\>*\s*\ze("
+
+" SDK libraries
+syntax keyword dartSdkClass     BidirectionalIterator Comparable DateTime
+    \ Duration Expando Function Invocation Iterable Iterator List Map Match
+    \ Object Pattern RegExp RuneIterator Runes Set StackTrace Stopwatch String
+    \ StringBuffer StringSink Symbol Type bool int double num
+syntax keyword dartSdkTypedef   Comparator
+syntax keyword dartSdkException AbstractClassInstantiationError
+    \ ArgumentError AssertionError CastError ConcurrentModificationError
+    \ Error Exception FallThroughError FormatException
+    \ IntegerDivisionByZeroException NoSuchMethodError NullThrownError
+    \ OutOfMemoryError RangeError RuntimeError StackOverflowError StateError
+    \ TypeError UnimplementedError UnsupportedError
 
 " Comments
 syntax keyword dartTodo          contained TODO FIXME XXX
@@ -119,21 +118,23 @@ highlight default link dartLineComment     Comment
 highlight default link dartLineDocComment  Comment
 highlight default link dartShebangLine     Comment
 highlight default link dartConstant        Constant
-highlight default link dartTypedef         Typedef
 highlight default link dartTodo            Todo
 highlight default link dartKeyword         Keyword
-highlight default link dartType            Type
-highlight default link dartTypeName        Type
 highlight default link dartInterpolation   PreProc
 highlight default link dartDocLink         SpecialComment
 highlight default link dartSpecialChar     SpecialChar
 highlight default link dartLibrary         Include
 highlight default link dartUri             String
 highlight default link dartCombinator      Keyword
-highlight default link dartCoreClasses     Type
-highlight default link dartCoreTypedefs    Typedef
-highlight default link dartCoreExceptions  Exception
 highlight default link dartMetadata        PreProc
+highlight default link dartSdkTypedef      Typedef
+highlight default link dartTypedef         Typedef
+highlight default link dartSdkException    Exception
+highlight default link dartSdkClass        dartType
+highlight default link dartCoreType        dartType
+highlight default link dartUserType        dartType
+highlight default link dartType            Type
+highlight default link dartFunction        Function
 
 let b:current_syntax = "dart"
 let b:spell_options = "contained"