CHROME: added codemirror ipython mode and some missing codes

minjk-bl · minjk-bl · commit a5981532e0d0 · 2022-08-10T19:34:51.000+09:00
diff --git a/js/com/component/PopupComponent.js b/js/com/component/PopupComponent.js
@@ -12,6 +12,41 @@
 //============================================================================
 // [CLASS] PopupComponent
 //============================================================================
+// CHROME: notebook/js/codemirror-ipython
+(function(mod) {
+    if (typeof exports == "object" && typeof module == "object"){ // CommonJS
+      mod(requirejs("codemirror/lib/codemirror"),
+          requirejs("codemirror/mode/python/python")
+          );
+    } else if (typeof define == "function" && define.amd){ // AMD
+      define('notebook/js/codemirror-ipython',["codemirror/lib/codemirror",
+              "codemirror/mode/python/python"], mod);
+    } else {// Plain browser env
+      mod(CodeMirror);
+    }
+})(function(CodeMirror) {
+    "use strict";
+
+    CodeMirror.defineMode("ipython", function(conf, parserConf) {
+        var pythonConf = {};
+        for (var prop in parserConf) {
+            if (parserConf.hasOwnProperty(prop)) {
+                pythonConf[prop] = parserConf[prop];
+            }
+        }
+        pythonConf.name = 'python';
+        pythonConf.singleOperators = new RegExp("^[\\+\\-\\*/%&|@\\^~<>!\\?]");
+        if (pythonConf.version === 3) {
+            pythonConf.identifiers = new RegExp("^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*");
+        } else if (pythonConf.version === 2) {
+            pythonConf.identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
+        }
+        return CodeMirror.getMode(conf, pythonConf);
+    }, 'python');
+
+    CodeMirror.defineMIME("text/x-ipython", "ipython");
+});
+
 define([
     'text!vp_base/html/component/popupComponent.html!strip',
     'css!vp_base/css/component/popupComponent',
@@ -25,9 +60,9 @@ define([
     /** codemirror */
     'codemirror/lib/codemirror',
     'codemirror/mode/python/python',
-    'notebook/js/codemirror-ipython',
     'codemirror/addon/display/placeholder',
-    'codemirror/addon/display/autorefresh'
+    'codemirror/addon/display/autorefresh',
+    'notebook/js/codemirror-ipython'
 ], function(popupComponentHtml, popupComponentCss
     , com_util, com_Const, com_String, com_interface, Component, DataSelector, codemirror
 ) {
diff --git a/js/loadVisualpython.js b/js/loadVisualpython.js
@@ -12,6 +12,8 @@
 //============================================================================
 // Load Visual Python
 //============================================================================
+// CHROME: removed code
+define([
     // CHROME: removed .css extension type
     'css!vp_base/css/root',
     'vp_base/js/com/com_Const',
@@ -27,7 +29,7 @@
     //========================================================================
     // Define variable
     //========================================================================
-    var Jupyter;
+    var Jupyter = null;
     var events;
     var liveNotebook = false;
 
@@ -149,7 +151,9 @@
         /**
          * visualpython config util
          */
-        window.vpConfig = new com_Config();
+        // CHROME: added extType as 'chrome'
+        // window.vpConfig = new com_Config();
+        window.vpConfig = new com_Config('chrome');
         window.VP_MODE_TYPE = com_Config.MODE_TYPE;
         /**
          * visualpython kernel
@@ -236,7 +240,10 @@
         let cfg = readConfig();
 
         vpConfig.readKernelFunction();
-        _addToolBarVpButton();
+        // CHROME: edited
+        if (Jupyter) {
+            _addToolBarVpButton();
+        }
         _loadVpResource(cfg);
         _checkVersion();
 
