Upgrade prism.js

supnate · Jun 14, 2018 · 80ed90a · 80ed90a
1 parent 3b8cd1e
commit 80ed90a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 528 deletions.
diff --git a/packages/rekit-studio/src/features/editor/workers/syntaxHighlighter.js b/packages/rekit-studio/src/features/editor/workers/syntaxHighlighter.js
@@ -1,7 +1,7 @@
 /* eslint no-restricted-globals: 0, prefer-spread: 0, no-continue: 0, no-use-before-define: 0 */
 /* global self, babylon */
 self.Prism = { disableWorkerMessageHandler: true };
-self.importScripts(['/static/libs/prism-1.13.0.js']);
+self.importScripts(['/static/libs/prism-1.14.0.js']);
 
 function getLineNumberAndOffset(start, lines) {
   let line = 0;
@@ -209,8 +209,15 @@ self.addEventListener('message', event => {
   const { code } = event.data;
   try {
     let tokens = Prism.tokenize(code, Prism.languages.jsx);
-    Prism.walkTokensForJsx(tokens);
+    const env = {
+      code,
+      grammar: Prism.languages.jsx,
+      language: 'javascript',
+      tokens,
+    };
+    Prism.hooks.run('after-tokenize', env);
     tokens = flattenTokens(tokens);
+
     const classifications = [];
     let pos = 0;
     const lines = code.split('\n').map(line => line.length);
@@ -246,5 +253,6 @@ self.addEventListener('message', event => {
     self.postMessage({ classifications });
   } catch (e) {
     /* Ignore error */
+    console.log('exp:', e);
   }
 });
diff --git a/packages/rekit-studio/src/libs/prism-1.12.2.js b/packages/rekit-studio/src/libs/prism-1.12.2.js