From ac2f91e5a80870b1bc180d20ed6ee8e6aff84585 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Sun, 24 May 2020 18:35:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0lint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +
 .../VueCodemirror/VueCodeMirror.vue           | 88 ++++++++++++-------
 src/components/preview/SimTextPreview.vue     | 21 +++--
 3 files changed, 70 insertions(+), 41 deletions(-)

diff --git a/package.json b/package.json
index 88687f1..1f9c69e 100644
--- a/package.json
+++ b/package.json
@@ -26,8 +26,10 @@
     "exif-js": "^2.3.0",
     "gsap": "^3.2.6",
     "highlightjs-line-numbers.js": "^2.7.0",
+    "htmlhint": "^0.13.0",
     "jquery": "^1.12.4",
     "js-cookie": "2.2.0",
+    "jshint": "^2.11.1",
     "lib-flexible": "^0.3.2",
     "mavon-editor": "^2.7.7",
     "normalize.css": "7.0.0",
diff --git a/src/components/VueCodemirror/VueCodeMirror.vue b/src/components/VueCodemirror/VueCodeMirror.vue
index e86dd06..2fda52d 100644
--- a/src/components/VueCodemirror/VueCodeMirror.vue
+++ b/src/components/VueCodemirror/VueCodeMirror.vue
@@ -6,25 +6,13 @@
 
 <script>
 
-  // htmlmixed mode
+  // 加载codemirror/mode目录下所有js文件
   const modulesFiles = require.context("codemirror/mode", true, /\.js$/);
-
-  // you do not need `import app from './modules/app'`
-
-  // it will auto require all vuex module from modules file
-
-  const modules = modulesFiles.keys().reduce((modules, modulePath) => {
-
-    // set './app.js' => 'app'
-
+  modulesFiles.keys().reduce((modules, modulePath) => {
     const moduleName = modulePath.replace(/^\.\/(.*)\.\w+$/, "$1");
-
     const value = modulesFiles(modulePath);
-
     modules[moduleName] = value.default;
-
     return modules;
-
   }, {});
   // require('codemirror/mode/xml/xml.js')
   // require('codemirror/mode/javascript/javascript.js')
@@ -42,6 +30,22 @@
   // require('codemirror/mode/dart/dart.js')
   // require('codemirror/mode/clike/clike.js')
 
+  // 语法警告
+  // 加载codemirror/addon/hint目录下所有js文件
+  window.JSHINT = require('jshint').JSHINT;
+  require('codemirror/addon/lint/lint.js')
+  require('codemirror/addon/lint/lint.css')
+  require('codemirror/addon/lint/javascript-lint.js')
+  // require('codemirror/addon/lint/json-lint.js')
+  // require('codemirror/addon/lint/html-lint.js')
+  // const modulesFiles1 = require.context("codemirror/addon/lint", true, /\.js$/);
+  // modulesFiles1.keys().reduce((modules, modulePath) => {
+  //   const moduleName = modulePath.replace(/^\.\/(.*)\.\w+$/, "$1");
+  //   const value = modulesFiles1(modulePath);
+  //   modules[moduleName] = value.default;
+  //   return modules;
+  // }, {});
+
   // theme
   require('codemirror/theme/idea.css')
   require('codemirror/theme/ayu-dark.css')
@@ -49,6 +53,7 @@
   require('codemirror/theme/3024-night.css')
   require('codemirror/theme/ambiance.css')
   require('codemirror/theme/seti.css')
+  require('codemirror/theme/darcula.css')
 
   // 支持代码折叠
   require('codemirror/addon/fold/foldgutter.css')
@@ -57,18 +62,22 @@
   require('codemirror/addon/fold/brace-fold.js')
   require('codemirror/addon/fold/comment-fold.js')
 
+  // 括号高亮
+  require('codemirror/addon/edit/matchbrackets.js')
+
   // 全屏模式
   require('codemirror/addon/display/fullscreen.css')
   require('codemirror/addon/display/fullscreen.js')
 
   // 自动补全
-  require('codemirror/addon/hint/show-hint.js')
-  require('codemirror/addon/hint/show-hint.css')
-  require('codemirror/addon/hint/javascript-hint.js')
   require('codemirror/addon/hint/anyword-hint.js')
-  require('codemirror/addon/hint/html-hint.js')
-  require('codemirror/addon/hint/xml-hint.js')
   require('codemirror/addon/hint/css-hint.js')
+  require('codemirror/addon/hint/html-hint.js')
+  require('codemirror/addon/hint/javascript-hint.js')
+  require('codemirror/addon/hint/show-hint.css')
+  require('codemirror/addon/hint/show-hint.js')
+  require('codemirror/addon/hint/sql-hint.js')
+  require('codemirror/addon/hint/xml-hint.js')
 
   // Crtl-F 搜索
   import 'codemirror/addon/dialog/dialog';
@@ -104,21 +113,26 @@
         nowValue: ''
       }
     },
-    ready: function () {
-      let that = this
-      this.editor = CodeMirror.fromTextArea(this.$el.querySelector('textarea'), this.options)
-      this.editor.setValue(this.value)
-      this.editor.on('change', function(cm) {
-        if (that.skipNextChangeEvent) {
-          that.skipNextChangeEvent = false
-          return
-        }
-        that.nowValue = cm.getValue()
-        if (!!that.$emit) {
-          that.$emit('change', cm.getValue())
-        }
-      })
-    },
+    // ready: function () {
+    //   let that = this
+    //   this.editor = CodeMirror.fromTextArea(this.$el.querySelector('textarea'), this.options)
+    //   this.editor.setValue(this.value)
+    //   this.editor.on('change', function(cm) {
+    //     console.log('change')
+    //     if (that.skipNextChangeEvent) {
+    //       that.skipNextChangeEvent = false
+    //       return
+    //     }
+    //     that.nowValue = cm.getValue()
+    //     if (!!that.$emit) {
+    //       that.$emit('change', cm.getValue())
+    //     }
+    //   })
+    //   this.editor.on("cursorActivity", () => {
+    //     console.log('cursorActivity')
+    //     this.editor.showHint();
+    //   });
+    // },
     beforeMount(){
       this.onKeyDown = this.onKeyDown.bind(this);
       document.addEventListener('keydown', this.onKeyDown);
@@ -138,6 +152,12 @@
           that.$emit('input', cm.getValue())
         }
       })
+
+      this.editor.on("cursorActivity", () => {
+        console.log('cursorActivity')
+        // this.editor.showHint();
+      });
+
       this.$nextTick(()=>{
         this.editor.clearHistory();
       })
diff --git a/src/components/preview/SimTextPreview.vue b/src/components/preview/SimTextPreview.vue
index 38ba2b8..a3497ba 100644
--- a/src/components/preview/SimTextPreview.vue
+++ b/src/components/preview/SimTextPreview.vue
@@ -59,18 +59,25 @@
       options: function () {
         return {
           mode: this.codeMode,//代码高亮
-          // tabSize: 2,  // table键缩进
-          styleActiveLine: true,
+          smartIndent: true, // 智能缩进
+          indentUnit: 4, // 智能缩进单位为4个空格长度
+          indentWithTabs: true, // 使用制表符进行智能缩进
+          styleActiveLine: true, // 显示选中行的样式
           lineNumbers: true, //显示行号
           lineWrapping: this.lineWrapping,//代码折叠
-          foldGutter: true,
-          gutters:["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
+          foldGutter: true, // 启用行槽中的代码折叠
+          // 在行槽中添加行号显示器、折叠器、语法检测器
+          gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter", "CodeMirror-lint-markers"],
           readOnly: this.readOnly,
-          theme: 'idea',
-          // theme: 'default',
+          // theme: 'darcula',
+          theme: 'default',
           fullScreen: false, // 全屏
           matchBrackets: true, //括号匹配
-          extraKeys: {'Ctrl-I': 'autocomplete'}, //智能提示
+          hintOptions: {
+            completeSingle: false
+          },
+          lint: true,
+          extraKeys: {'ctrl-space': 'autocomplete'}, //智能提示
         }
       }
     },