diff --git a/src/main/java/com/zhangmeng/tools/controller/FileEditController.java b/src/main/java/com/zhangmeng/tools/controller/FileEditController.java
index 02e5d42..63994b9 100644
--- a/src/main/java/com/zhangmeng/tools/controller/FileEditController.java
+++ b/src/main/java/com/zhangmeng/tools/controller/FileEditController.java
@@ -21,6 +21,8 @@ import javafx.scene.Node;
import javafx.scene.control.*;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyCodeCombination;
import javafx.scene.input.MouseButton;
import javafx.scene.input.MouseEvent;
import javafx.scene.layout.HBox;
@@ -57,6 +59,14 @@ import java.util.regex.Pattern;
@Slf4j
public class FileEditController {
+ @FXML
+ public MenuItem save;
+
+ @FXML
+ public MenuItem open_file;
+
+ @FXML
+ public MenuItem open_dir;
public enum Type {
@@ -84,6 +94,12 @@ public class FileEditController {
@FXML
public void initialize() {
+
+ // 设置快捷键
+ save.setAccelerator(new KeyCodeCombination(KeyCode.S, KeyCodeCombination.CONTROL_DOWN));
+ open_file.setAccelerator(new KeyCodeCombination(KeyCode.F, KeyCodeCombination.CONTROL_DOWN));
+ open_dir.setAccelerator(new KeyCodeCombination(KeyCode.D, KeyCodeCombination.CONTROL_DOWN));
+
//读取本地加载记录
Properties s = config_path(false);
recursiveFileList = new RecursiveFileList(null);
diff --git a/src/main/java/com/zhangmeng/tools/languages/ProcessHtml.java b/src/main/java/com/zhangmeng/tools/languages/ProcessHtml.java
index de5379d..b8db767 100644
--- a/src/main/java/com/zhangmeng/tools/languages/ProcessHtml.java
+++ b/src/main/java/com/zhangmeng/tools/languages/ProcessHtml.java
@@ -10,18 +10,15 @@ import java.util.regex.Pattern;
public class ProcessHtml {
public static final String[] KEYWORDS = new String[] {
- "", "", "", "", "",
- "", "", "", "
",
- "
", "", "style", "", "", "", ">",
- "", "
", "
", "
",
- "", "","","","",
- "", "", "
", "",""
+ "DOCTYPE","doctype", "html", "head", "body",
+ "h1", "h2","h3","h4","h5","h6", "p", "br","meta",
+ "title","img", "hr", "a", "table","div","span",
+ "ul", "dl","dd","i","script","li","link"
};
public static final String[] KEYWORDS2 = new String[] {
- "href", "name", "style", "finally", "id", "src",
- "return"
+ "href", "name", "style", "rel", "id", "src","media","content","http-equiv",
+ "return","class","target","charset","lay-filter","window","global","document"
};
public static final String KEYWORD_PATTERN = "\\b(" + String.join("|", KEYWORDS) + ")\\b";
@@ -38,7 +35,6 @@ public class ProcessHtml {
public static final Pattern PATTERN = Pattern.compile(
"(?" + KEYWORD_PATTERN + ")"
- + "|(?" + KEYWORD_PATTERN2 + ")"
+ "|(?" + PAREN_PATTERN + ")"
+ "|(?" + BRACE_PATTERN + ")"
+ "|(?" + BRACKET_PATTERN + ")"
@@ -48,6 +44,7 @@ public class ProcessHtml {
+ "|(?" + ANNOTATION_PATTERN + ")"
+ "|(?" + PARAMS_PATTERN + ")"
+ "|(?" + METHOD_PATTERN + ")"
+ + "|(?" + KEYWORD_PATTERN2 + ")"
);
diff --git a/src/main/resources/css/code.css b/src/main/resources/css/code.css
index edd74b6..ffe2291 100644
--- a/src/main/resources/css/code.css
+++ b/src/main/resources/css/code.css
@@ -156,7 +156,7 @@
}
.code-area .method2 {
- -fx-fill: #b76bd5;
+ -fx-fill: #699f45;
-fx-text-fill: red;
}
diff --git a/src/main/resources/fxml/file-edit.fxml b/src/main/resources/fxml/file-edit.fxml
index 7e71066..ee6a20d 100644
--- a/src/main/resources/fxml/file-edit.fxml
+++ b/src/main/resources/fxml/file-edit.fxml
@@ -14,9 +14,9 @@