Exception hierarchy highlighting fixed.

vim/after/syntax/cpp.vim

@@ -19,19 +19,23 @@ syn keyword cxxExportNamespace exports
 
 syn match cxxConstants  "\<\(C::[A-Za-z_]\|k[A-Z]\)[A-Z_a-z0-9]*\>"
 
-syn keyword cxxErrorNames      Critical CriticalError
-
-syn keyword cxxExceptionNames  Exception Exceptions Error
-syn match   cxxExceptionNames  "\<[A-Z][A-Za-z0-9_]*Exception\>"
-syn match   cxxExceptionNames  "\<[A-Z][A-Za-z0-9_]*Error\>"
-syn match   cxxErrorNames      "\<Critical[A-Z][A-Za-z0-9_]*Error\>"
-
-syn keyword cxxNotificationNames Notification
+syn keyword cxxExceptionNames      Exception Exception
 
 syn keyword cxxConditionNames      Condition
-
+syn keyword cxxNotificationNames   Notification
+syn keyword cxxErrorNames          Error
+syn keyword cxxCriticalNames       Critical CriticalError
 syn keyword cxxViolationNames      Violation
 
+syn match   cxxExceptionNames  "\<[A-Z][A-Za-z0-9_]*Exception\>"
+
+syn match   cxxConditionNames     "\<[A-Z][A-Za-z0-9_]*Condition\>"
+syn match   cxxNotificationNames  "\<[A-Z][A-Za-z0-9_]*Notification\>"
+syn match   cxxErrorNames         "\<[A-Z][A-Za-z0-9_]*Error\>"
+syn match   cxxCriticalNames "\<Critical[A-Z][A-Za-z0-9_]*Error\>"
+syn match   cxxCriticalNames "\<[A-Z][A-Za-z0-9_]*CriticalError\>"
+syn match   cxxViolationNames     "\<[A-Z][A-Za-z0-9_]*Violation\>"
+
 syn match cxxCast              "\<\(const\|static\|dynamic\|reinterpret\)_cast\s*\(<\)\@="
 
 
@@ -232,13 +236,17 @@ if version >= 508 || !exists("did_cxx_syntax_inits")
 
   HiLink cxxStatement      Statement
 
-  HiLink cxxErrorNames     Error
-  HiLink cxxExceptionNames Exception
+  " The exception breakdown:
+  HiLink cxxExceptionNames    Throwable
+
   HiLink cxxConditionNames    Condition
   HiLink cxxNotificationNames Notification
+  HiLink cxxErrorNames        Exception
+  HiLink cxxCriticalNames     Critical
   HiLink cxxViolationNames    Violation
 
   HiLink cxxStlExceptionNames Exception
+
   HiLink cxxStlNothrow     Nothrow
   HiLink cxxStlNothrowObject     NothrowObject
   HiLink cxxDebug          Debug

vim/colors/adam.vim

@@ -91,14 +91,19 @@ hi MetaFunction ctermfg=darkcyan start=<esc>[36m stop=<esc>[0m
 hi Comment ctermfg=darkgrey cterm=none term=NONE term=none start=<esc>[38;5;242m stop=<esc>[0m
 hi Identifier ctermfg=cyan cterm=none term=none start=<esc>[96m stop=<esc>[0m
 hi Object ctermfg=red term=none start=<esc>[91m stop=<esc>[0m
-hi Exception ctermfg=brown term=none start=<esc>[38;5;130m stop=<esc>[0m
-hi Notification ctermfg=yellow cterm=italic
+
+
+hi Throwable ctermfg=cyan term=underline
+
 hi Condition    ctermfg=darkgreen cterm=italic
-hi Violation ctermfg=208 cterm=italic,underline
+hi Notification ctermfg=yellow cterm=italic
+hi Exception        ctermfg=brown cterm=italic
+hi Critical     ctermfg=202 cterm=italic,underline
+hi Violation    ctermbg=red ctermfg=white
+
 hi Nothrow ctermfg=215  term=none start=<esc>[38;5;130m stop=<esc>[0m
 hi Nothrow ctermfg=58  term=none start=<esc>[38;5;130m stop=<esc>[0m
 hi Service ctermfg=green start=<esc>[32m stop=<esc>[0m
-hi Error ctermbg=red ctermfg=white cterm=none term=none start=<esc>[101;97m stop=<esc>[0m
 hi Caller ctermfg=cyan term=NONE start=<esc>[96m stop=<esc>[0m
 hi Target ctermfg=green ctermbg=red
 hi Sync ctermfg=green ctermbg=red