From bcbbfd1ec6c80f0baacdc01fd0627300a7890535 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Thu, 28 Sep 2017 14:26:36 +0800
Subject: [PATCH] add: code folding

---
 .../editor/codemirror/addon/fold/foldgutter.css       |  4 ++--
 app/src/main/assets/editor/index.html                 | 11 +++++++++++
 .../external/tasker/TaskerScriptEditActivity.java     |  6 ------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/main/assets/editor/codemirror/addon/fold/foldgutter.css b/app/src/main/assets/editor/codemirror/addon/fold/foldgutter.css
index ad19ae2d..f9b7d931 100644
--- a/app/src/main/assets/editor/codemirror/addon/fold/foldgutter.css
+++ b/app/src/main/assets/editor/codemirror/addon/fold/foldgutter.css
@@ -2,11 +2,11 @@
   color: blue;
   text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
   font-family: arial;
-  line-height: .3;
+  line-height: .7;
   cursor: pointer;
 }
 .CodeMirror-foldgutter {
-  width: .7em;
+  width: 1em;
 }
 .CodeMirror-foldgutter-open,
 .CodeMirror-foldgutter-folded {
diff --git a/app/src/main/assets/editor/index.html b/app/src/main/assets/editor/index.html
index f3759f63..8fdb5f72 100644
--- a/app/src/main/assets/editor/index.html
+++ b/app/src/main/assets/editor/index.html
@@ -19,6 +19,15 @@
 <script type="text/javascript" src="codemirror/addon/edit/matchbrackets.js"></script>
 <script type="text/javascript" src="codemirror/addon/display/fullscreen.js"></script>
 
+<!--代码折叠-->
+<link rel="stylesheet" href="codemirror/addon/fold/foldgutter.css"/>
+<script src="codemirror/addon/fold/foldcode.js"></script>
+<script src="codemirror/addon/fold/foldgutter.js"></script>
+<script src="codemirror/addon/fold/brace-fold.js"></script>
+<script src="codemirror/addon/fold/xml-fold.js"></script>
+<script src="codemirror/addon/fold/indent-fold.js"></script>
+<script src="codemirror/addon/fold/comment-fold.js"></script>
+
 <!-- 代码补全 -->
 <link rel="stylesheet" href="codemirror/addon/hint/show-hint.css">
 <script src="codemirror/addon/hint/javascript-hint.js"></script>
@@ -38,6 +47,8 @@
         lineNumbers: true,     // 显示行数
         indentUnit: 4,         // 缩进单位为4
         styleActiveLine: true, // 当前行背景高亮
+        foldGutter: true,
+        gutters:["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
         matchBrackets: true,   // 括号匹配
         mode: 'javascript',     // HMTL混合模式
         lineWrapping: false,    // 自动换行
diff --git a/app/src/main/java/com/stardust/scriptdroid/external/tasker/TaskerScriptEditActivity.java b/app/src/main/java/com/stardust/scriptdroid/external/tasker/TaskerScriptEditActivity.java
index e25fed9a..ab4330cd 100644
--- a/app/src/main/java/com/stardust/scriptdroid/external/tasker/TaskerScriptEditActivity.java
+++ b/app/src/main/java/com/stardust/scriptdroid/external/tasker/TaskerScriptEditActivity.java
@@ -2,16 +2,10 @@ package com.stardust.scriptdroid.external.tasker;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.widget.TextView;
 
 import com.stardust.scriptdroid.R;
 import com.stardust.scriptdroid.ui.BaseActivity;
 import com.stardust.scriptdroid.ui.edit.EditorView;
-import com.stardust.theme.ThemeColorManager;
-import com.stardust.widget.ToolbarMenuItem;
 
 import org.androidannotations.annotations.AfterViews;
 import org.androidannotations.annotations.EActivity;