解决高版本工具类丢失的bug

Linindoo · Jul 7, 2020 · d01e321 · d01e321
1 parent 261ac9b
commit d01e321
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/cn/olange/model/RuleTableCellRender.java b/src/cn/olange/model/RuleTableCellRender.java
@@ -3,7 +3,6 @@
 import com.google.gson.JsonObject;
 import com.intellij.ui.ColoredTableCellRenderer;
 import com.intellij.ui.SimpleTextAttributes;
-import groovy.json.StringEscapeUtils;
 
 import javax.swing.*;
 
@@ -13,7 +12,7 @@ public class RuleTableCellRender extends ColoredTableCellRenderer {
 	protected void customizeCellRenderer(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) {
 		if (value instanceof JsonObject) {
 			JsonObject ruleObj = (JsonObject) value;
-			this.append("  " + StringEscapeUtils.escapeJava(ruleObj.get("rule").getAsString()), SimpleTextAttributes.SYNTHETIC_ATTRIBUTES);
+			this.append("  " + ruleObj.get("rule").getAsString(), SimpleTextAttributes.SYNTHETIC_ATTRIBUTES);
 		}
 
 		setBorder(null);

diff --git a/src/cn/olange/ui/AnyRulePopupPanel.java b/src/cn/olange/ui/AnyRulePopupPanel.java
@@ -44,7 +44,6 @@
 import com.intellij.ui.table.JBTable;
 import com.intellij.util.Alarm;
 import com.intellij.util.ui.*;
-import groovy.json.StringEscapeUtils;
 import net.miginfocom.swing.MigLayout;
 import org.jdesktop.swingx.JXTextArea;
 import org.jetbrains.annotations.NotNull;
@@ -431,7 +430,7 @@ public void insertRuleToDocument() {
 			WriteCommandAction.Builder builder = WriteCommandAction.writeCommandAction(AnyRulePopupPanel.this.project);
 			builder.run(() -> {
 				String  rule = value.get("rule").getAsString();
-				editor.getDocument().insertString(offset, StringEscapeUtils.escapeJava(convertRule(rule)));
+				editor.getDocument().insertString(offset, convertRule(rule));
 			});
 		});
 	}

diff --git a/src/cn/olange/ui/RulePreviewPanel.java b/src/cn/olange/ui/RulePreviewPanel.java
@@ -10,7 +10,6 @@
 import com.intellij.ui.components.JBScrollPane;
 import com.intellij.util.ui.JBInsets;
 import com.intellij.util.ui.JBUI;
-import groovy.json.StringEscapeUtils;
 import org.jdesktop.swingx.JXTextArea;
 
 import java.awt.*;
@@ -46,7 +45,7 @@ public void updateLayoutLater(JsonObject row) {
 		String examples = row.get("examples").getAsString();
 		this.setBorder(IdeBorderFactory.createTitledBorder(title, false, new JBInsets(8, 0, 0, 0)).setShowLine(false));
 		this.setToolTipText(title);
-		this.textArea.setText(StringEscapeUtils.escapeJava(rule));
+		this.textArea.setText(rule);
 		this.examples.setText(examples);
 	}