Fix CodeMirror highlight for directives and use a theme that supports…

… variables
LogtalkDotOrg · Dec 5, 2018 · cc17ae1 · cc17ae1
1 parent d2085e9
commit cc17ae1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/coding/codemirror/index.html b/coding/codemirror/index.html
@@ -5,7 +5,7 @@
 <link rel=stylesheet href="../../doc/docs.css">
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../theme/twilight.css">
+<link rel="stylesheet" href="../../theme/ambiance.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="logtalk.js"></script>
@@ -475,7 +475,7 @@ <h2>Logtalk mode</h2>
         lineNumbers: true,
         matchBrackets: true,
         extraKeys: {"Tab":  "indentAuto"},
-        theme: "twilight"
+        theme: "ambiance"
       });
     </script>
 

diff --git a/coding/codemirror/logtalk.js b/coding/codemirror/logtalk.js
@@ -488,33 +488,33 @@ CodeMirror.defineMode("logtalk", function(cmCfg, modeCfg) {
                regex: '%.*$\\n?' },
              { todo: 'fix grouping',
                token: 
-                [ 'storage.type.opening.logtalk',
+                [  'meta.type.opening.logtalk',
                   'punctuation.definition.storage.type.logtalk' ],
                regex: ':-\\s(?:object|protocol|category|module)(?=[(])' },
              { todo: 'fix grouping',
                token: 
-                [ 'storage.type.closing.logtalk',
+                [  'meta.type.closing.logtalk',
                   'punctuation.definition.storage.type.logtalk' ],
                regex: ':-\\send_(?:object|protocol|category)(?=[.])' },
              { caseInsensitive: false,
-               token: 'storage.type.relations.logtalk',
+               token:  'meta.type.relations.logtalk',
                regex: '\\b(?:complements|extends|i(?:nstantiates|mp(?:orts|lements))|specializes)(?=[(])' },
              { caseInsensitive: false,
                todo: 'fix grouping',
                token: 
-                [ 'storage.modifier.others.logtalk',
+                [  'meta.modifier.others.logtalk',
                   'punctuation.definition.storage.modifier.logtalk' ],
                regex: ':-\\s(?:e(?:lse|ndif)|built_in|dynamic|synchronized|threaded)(?=[.])' },
              { caseInsensitive: false,
                todo: 'fix grouping',
                token: 
-                [ 'storage.modifier.others.logtalk',
+                [  'meta.modifier.others.logtalk',
                   'punctuation.definition.storage.modifier.logtalk' ],
                regex: ':-\\s(?:c(?:alls|oinductive)|e(?:lif|n(?:coding|sure_loaded)|xport)|i(?:f|n(?:clude|itialization|fo))|reexport|set_(?:logtalk|prolog)_flag|uses)(?=[(])' },
              { caseInsensitive: false,
                todo: 'fix grouping',
                token: 
-                [ 'storage.modifier.others.logtalk',
+                [  'meta.modifier.others.logtalk',
                   'punctuation.definition.storage.modifier.logtalk' ],
                regex: ':-\\s(?:alias|info|d(?:ynamic|iscontiguous)|m(?:eta_(?:non_terminal|predicate)|ode|ultifile)|p(?:ublic|r(?:otected|ivate))|op|use(?:s|_module)|synchronized)(?=[(])' },
              { token: 'keyword.operator.message-sending.logtalk',