Skip to content

Commit 900a24f

Browse files
author
pvan
committed
update to new version
1 parent fa05ae0 commit 900a24f

9 files changed

+46
-34
lines changed

‎src/main/java/com/en_circle/slt/plugin/SltDocumentationProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
import com.en_circle.slt.plugin.lisp.LispParserUtil;
55
import com.en_circle.slt.plugin.lisp.psi.LispSymbol;
66
import com.en_circle.slt.plugin.services.lisp.LispEnvironmentService;
7+
import com.en_circle.slt.tools.EscapeUtils;
78
import com.intellij.lang.documentation.AbstractDocumentationProvider;
89
import com.intellij.openapi.util.text.HtmlBuilder;
910
import com.intellij.openapi.util.text.HtmlChunk;
1011
import com.intellij.psi.PsiElement;
1112
import com.intellij.psi.util.PsiTreeUtil;
1213
import org.apache.commons.lang3.StringUtils;
13-
import org.apache.commons.text.StringEscapeUtils;
1414
import org.jetbrains.annotations.Nls;
1515
import org.jetbrains.annotations.Nullable;
1616

@@ -95,6 +95,6 @@ private String asHtml(SymbolState state, PsiElement element) {
9595

9696

9797
private String escape(String s) {
98-
return StringEscapeUtils.escapeHtml4(s);
98+
return EscapeUtils.escapeHtml4(s);
9999
}
100100
}

‎src/main/java/com/en_circle/slt/plugin/actions/MacroexpandActionBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.en_circle.slt.plugin.lisp.LispParserUtil;
77
import com.en_circle.slt.plugin.lisp.psi.LispList;
88
import com.en_circle.slt.plugin.services.lisp.LispEnvironmentService;
9+
import com.en_circle.slt.tools.EscapeUtils;
910
import com.intellij.openapi.actionSystem.ActionUpdateThread;
1011
import com.intellij.openapi.actionSystem.AnAction;
1112
import com.intellij.openapi.actionSystem.AnActionEvent;
@@ -22,7 +23,6 @@
2223
import com.intellij.psi.PsiElement;
2324
import com.intellij.psi.PsiFile;
2425
import org.apache.commons.lang3.StringUtils;
25-
import org.apache.commons.text.StringEscapeUtils;
2626
import org.jetbrains.annotations.NotNull;
2727

2828
import javax.swing.*;
@@ -56,7 +56,7 @@ public void actionPerformed(@NotNull AnActionEvent event) {
5656
String packageName = LispParserUtil.getPackage(psiFile, offset);
5757
macroexpand(editor.getProject(), list, packageName, text -> SwingUtilities.invokeLater(() -> {
5858
HtmlBuilder builder = new HtmlBuilder();
59-
String macroExpand = StringUtils.replace(StringUtils.replace(StringEscapeUtils.escapeHtml4(text), " ", " "),
59+
String macroExpand = StringUtils.replace(StringUtils.replace(EscapeUtils.escapeHtml4(text), " ", " "),
6060
"\n", HtmlChunk.br().toString());
6161
builder.append(HtmlChunk.raw(macroExpand));
6262

‎src/main/java/com/en_circle/slt/plugin/highlights/SltBraceHighlighter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ private void highlightRightBrace(Editor editor, @NotNull HighlighterIterator ite
261261
highlightBraces(editor, brace2, brace1, matched, false, fileType);
262262
}
263263

264+
@SuppressWarnings("SameParameterValue")
264265
private void highlightLeftBrace(Editor editor, @NotNull HighlighterIterator iterator, boolean scopeHighlighting, @NotNull FileType fileType, Document document) {
265266
TextRange brace1Start = TextRange.create(iterator.getStart(), iterator.getEnd());
266267
boolean matched = matchBrace(document.getCharsSequence(), fileType, iterator, true);
@@ -483,6 +484,7 @@ private static synchronized boolean matchBrace(@NotNull CharSequence fileText,
483484
}
484485

485486

487+
@SuppressWarnings("BooleanMethodIsAlwaysInverted")
486488
private static boolean isPairBraces(@NotNull IElementType tokenType1, @NotNull IElementType tokenType2, @NotNull FileType fileType) {
487489
return (tokenType1.equals(LispTypes.LPAREN) && tokenType2.equals(LispTypes.RPAREN)) || (tokenType1.equals(LispTypes.RPAREN) && tokenType2.equals(LispTypes.LPAREN));
488490
}

‎src/main/java/com/en_circle/slt/plugin/ui/sdk/SdkConfigurationABCLProcess.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ public SdkConfigurationABCLProcess(@NotNull Component parent, LispSdk instance,
8686
quicklispPath.getField().setText(instance.quickLispPath);
8787

8888
TextFieldWithBrowseButton abclExecutablePicker = new TextFieldWithBrowseButton(jvmExecutable.getField());
89-
abclExecutablePicker.addBrowseFolderListener(
90-
SltBundle.message("slt.ui.settings.sdk.editor.jvm.select"), "", null, descriptor);
89+
abclExecutablePicker.addBrowseFolderListener(null,
90+
descriptor.withTitle(SltBundle.message("slt.ui.settings.sdk.editor.jvm.select")).withDescription(""));
9191
TextFieldWithBrowseButton abclJarPicker = new TextFieldWithBrowseButton(jar.getField());
92-
abclJarPicker.addBrowseFolderListener(
93-
SltBundle.message("slt.ui.settings.sdk.editor.abcl.select"), "", null, descriptorJar);
92+
abclJarPicker.addBrowseFolderListener(null,
93+
descriptor.withTitle(SltBundle.message("slt.ui.settings.sdk.editor.abcl.select")).withDescription(""));
9494
TextFieldWithBrowseButton quicklispPathPicker = new TextFieldWithBrowseButton(quicklispPath.getField());
9595
//noinspection DialogTitleCapitalization
96-
quicklispPathPicker.addBrowseFolderListener(
97-
SltBundle.message("slt.ui.settings.sdk.editor.quicklisp.select"), "", null, descriptor);
96+
quicklispPathPicker.addBrowseFolderListener(null,
97+
descriptor.withTitle(SltBundle.message("slt.ui.settings.sdk.editor.quicklisp.select")).withDescription(""));
9898

9999
return new FormBuilder()
100100
.addLabeledComponent(SltBundle.message("slt.ui.settings.sdk.editor.name"), name, 1, false)

‎src/main/java/com/en_circle/slt/plugin/ui/sdk/SdkConfigurationAllegroCLProcess.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,14 @@ public SdkConfigurationAllegroCLProcess(@NotNull Component parent, LispSdk insta
8080
quicklispPath.getField().setText(instance.quickLispPath);
8181

8282
TextFieldWithBrowseButton cclExecutablePicker = new TextFieldWithBrowseButton(allegroExecutable.getField());
83-
cclExecutablePicker.addBrowseFolderListener(
84-
SltBundle.message("slt.ui.settings.sdk.editor.allegro.executable.select"), "", null, descriptor);
83+
cclExecutablePicker.addBrowseFolderListener(null, descriptor.withTitle(SltBundle.message("slt.ui.settings.sdk.editor.allegro.executable.select")).withDescription(""));
8584
TextFieldWithBrowseButton cclImagePicker = new TextFieldWithBrowseButton(allegroImage.getField());
86-
cclImagePicker.addBrowseFolderListener(
87-
SltBundle.message("slt.ui.settings.sdk.editor.allegro.image.select"), "", null, descriptor);
85+
cclImagePicker.addBrowseFolderListener(null,
86+
descriptor.withTitle(SltBundle.message("slt.ui.settings.sdk.editor.allegro.image.select")).withDescription(""));
8887
TextFieldWithBrowseButton quicklispPathPicker = new TextFieldWithBrowseButton(quicklispPath.getField());
8988
//noinspection DialogTitleCapitalization
90-
quicklispPathPicker.addBrowseFolderListener(
91-
SltBundle.message("slt.ui.settings.sdk.editor.quicklisp.select"), "", null, descriptor);
89+
quicklispPathPicker.addBrowseFolderListener(null,
90+
descriptor.withTitle(SltBundle.message("slt.ui.settings.sdk.editor.quicklisp.select")).withDescription(""));
9291

9392
return new FormBuilder()
9493
.addLabeledComponent(SltBundle.message("slt.ui.settings.sdk.editor.name"), name, 1, false)

‎src/main/java/com/en_circle/slt/plugin/ui/sdk/SdkConfigurationCCLProcess.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ public SdkConfigurationCCLProcess(@NotNull Component parent, LispSdk instance, S
8080
quicklispPath.getField().setText(instance.quickLispPath);
8181

8282
TextFieldWithBrowseButton cclExecutablePicker = new TextFieldWithBrowseButton(cclExecutable.getField());
83-
cclExecutablePicker.addBrowseFolderListener(
84-
SltBundle.message("slt.ui.settings.sdk.editor.ccl.executable.select"), "", null, descriptor);
83+
cclExecutablePicker.addBrowseFolderListener(null,
84+
descriptor.withTitle(SltBundle.message("slt.ui.settings.sdk.editor.ccl.executable.select")).withDescription(""));
8585
TextFieldWithBrowseButton cclImagePicker = new TextFieldWithBrowseButton(cclImage.getField());
86-
cclImagePicker.addBrowseFolderListener(
87-
SltBundle.message("slt.ui.settings.sdk.editor.ccl.image.select"), "", null, descriptor);
86+
cclImagePicker.addBrowseFolderListener(null,
87+
descriptor.withTitle(SltBundle.message("slt.ui.settings.sdk.editor.ccl.image.select")).withDescription(""));
8888
TextFieldWithBrowseButton quicklispPathPicker = new TextFieldWithBrowseButton(quicklispPath.getField());
8989
//noinspection DialogTitleCapitalization
90-
quicklispPathPicker.addBrowseFolderListener(
91-
SltBundle.message("slt.ui.settings.sdk.editor.quicklisp.select"), "", null, descriptor);
90+
quicklispPathPicker.addBrowseFolderListener(null,
91+
descriptor.withTitle(SltBundle.message("slt.ui.settings.sdk.editor.quicklisp.select")).withDescription(""));
9292

9393
return new FormBuilder()
9494
.addLabeledComponent(SltBundle.message("slt.ui.settings.sdk.editor.name"), name, 1, false)

‎src/main/java/com/en_circle/slt/plugin/ui/sdk/SdkConfigurationCMUCLProcess.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ public SdkConfigurationCMUCLProcess(@NotNull Component parent, LispSdk instance,
8080
quicklispPath.getField().setText(instance.quickLispPath);
8181

8282
TextFieldWithBrowseButton cmuclExecutablePicker = new TextFieldWithBrowseButton(cmuclExecutable.getField());
83-
cmuclExecutablePicker.addBrowseFolderListener(
84-
SltBundle.message("slt.ui.settings.sdk.editor.cmucl.executable.select"), "", null, descriptor);
83+
cmuclExecutablePicker.addBrowseFolderListener(null,
84+
descriptor.withTitle(SltBundle.message("slt.ui.settings.sdk.editor.cmucl.executable.select")).withDescription(""));
8585
TextFieldWithBrowseButton cmuclImagePicker = new TextFieldWithBrowseButton(cmuclImage.getField());
86-
cmuclImagePicker.addBrowseFolderListener(
87-
SltBundle.message("slt.ui.settings.sdk.editor.cmucl.image.select"), "", null, descriptor);
86+
cmuclImagePicker.addBrowseFolderListener(null,
87+
descriptor.withTitle(SltBundle.message("slt.ui.settings.sdk.editor.cmucl.image.select")).withDescription(""));
8888
TextFieldWithBrowseButton quicklispPathPicker = new TextFieldWithBrowseButton(quicklispPath.getField());
8989
//noinspection DialogTitleCapitalization
90-
quicklispPathPicker.addBrowseFolderListener(
91-
SltBundle.message("slt.ui.settings.sdk.editor.quicklisp.select"), "", null, descriptor);
90+
quicklispPathPicker.addBrowseFolderListener(null,
91+
descriptor.withTitle(SltBundle.message("slt.ui.settings.sdk.editor.quicklisp.select")).withDescription(""));
9292

9393
return new FormBuilder()
9494
.addLabeledComponent(SltBundle.message("slt.ui.settings.sdk.editor.name"), name, 1, false)

‎src/main/java/com/en_circle/slt/plugin/ui/sdk/SdkConfigurationSBCLProcess.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ public SdkConfigurationSBCLProcess(@NotNull Component parent, LispSdk instance,
8080
quicklispPath.getField().setText(instance.quickLispPath);
8181

8282
TextFieldWithBrowseButton sbclExecutablePicker = new TextFieldWithBrowseButton(sbclExecutable.getField());
83-
sbclExecutablePicker.addBrowseFolderListener(
84-
SltBundle.message("slt.ui.settings.sdk.editor.sbcl.executable.select"), "", null, descriptor);
83+
sbclExecutablePicker.addBrowseFolderListener(null,
84+
descriptor.withTitle(SltBundle.message("slt.ui.settings.sdk.editor.sbcl.executable.select")).withDescription(""));
8585
TextFieldWithBrowseButton sbclCorePicker = new TextFieldWithBrowseButton(sbclCore.getField());
86-
sbclCorePicker.addBrowseFolderListener(
87-
SltBundle.message("slt.ui.settings.sdk.editor.sbcl.core.select"), "", null, descriptor);
86+
sbclCorePicker.addBrowseFolderListener(null,
87+
descriptor.withTitle(SltBundle.message("slt.ui.settings.sdk.editor.sbcl.core.select")).withDescription(""));
8888
TextFieldWithBrowseButton quicklispPathPicker = new TextFieldWithBrowseButton(quicklispPath.getField());
8989
//noinspection DialogTitleCapitalization
90-
quicklispPathPicker.addBrowseFolderListener(
91-
SltBundle.message("slt.ui.settings.sdk.editor.quicklisp.select"), "", null, descriptor);
90+
quicklispPathPicker.addBrowseFolderListener(null,
91+
descriptor.withTitle(SltBundle.message("slt.ui.settings.sdk.editor.quicklisp.select")).withDescription(""));
9292

9393
return new FormBuilder()
9494
.addLabeledComponent(SltBundle.message("slt.ui.settings.sdk.editor.name"), name, 1, false)

‎src/main/java/com/en_circle/slt/tools/EscapeUtils.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.en_circle.slt.tools;
2+
3+
import com.google.common.html.HtmlEscapers;
4+
5+
public class EscapeUtils {
6+
7+
public static String escapeHtml4(String html) {
8+
return HtmlEscapers.htmlEscaper().escape(html);
9+
}
10+
11+
}

0 commit comments

Comments
 (0)