Skip to content

Commit 74072b9

Browse files
ahus1ahus1
committed
Code cleanup
1 parent a2389f8 commit 74072b9

File tree

3 files changed

+57
-64
lines changed

3 files changed

+57
-64
lines changed

‎src/main/java/org/asciidoc/intellij/actions/OpenDevtoolsAction.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ public class OpenDevtoolsAction extends AsciiDocAction {
1212
@Override
1313
public void actionPerformed(@NotNull AnActionEvent event) {
1414
SplitFileEditor<?, ?> fileEditor = AsciiDocActionUtil.findSplitEditor(event);
15-
if (fileEditor instanceof AsciiDocSplitEditor) {
16-
AsciiDocHtmlPanel panel = ((AsciiDocSplitEditor) fileEditor).getSecondEditor().getPanel();
15+
if (fileEditor instanceof AsciiDocSplitEditor asciiDocSplitEditor) {
16+
AsciiDocHtmlPanel panel = asciiDocSplitEditor.getSecondEditor().getPanel();
1717
if (panel instanceof AsciiDocJCEFHtmlPanel asciiDocJCEFHtmlPanel) {
1818
if (!asciiDocJCEFHtmlPanel.isDisposed()) {
1919
asciiDocJCEFHtmlPanel.openDevtools();
@@ -26,8 +26,8 @@ public void actionPerformed(@NotNull AnActionEvent event) {
2626
public void update(@NotNull AnActionEvent event) {
2727
boolean visible = false;
2828
SplitFileEditor<?, ?> fileEditor = AsciiDocActionUtil.findSplitEditor(event);
29-
if (fileEditor instanceof AsciiDocSplitEditor) {
30-
AsciiDocHtmlPanel panel = ((AsciiDocSplitEditor) fileEditor).getSecondEditor().getPanel();
29+
if (fileEditor instanceof AsciiDocSplitEditor asciiDocSplitEditor) {
30+
AsciiDocHtmlPanel panel = asciiDocSplitEditor.getSecondEditor().getPanel();
3131
if (panel instanceof AsciiDocJCEFHtmlPanel) {
3232
visible = true;
3333
}

‎src/main/java/org/asciidoc/intellij/editor/javafx/PreviewStaticServer.java‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
import java.io.IOException;
3636
import java.io.InputStream;
37-
import java.io.UnsupportedEncodingException;
3837
import java.net.URLEncoder;
3938
import java.nio.charset.StandardCharsets;
4039
import java.util.List;
@@ -44,7 +43,7 @@
4443
import java.util.regex.Pattern;
4544

4645
public class PreviewStaticServer extends HttpRequestHandler {
47-
private Logger log = Logger.getInstance(PreviewStaticServer.class);
46+
private final Logger log = Logger.getInstance(PreviewStaticServer.class);
4847

4948
private static final Logger LOG = Logger.getInstance(PreviewStaticServer.class);
5049
private static final String PREFIX = "/ead61b63-b0a6-4ff2-a49a-86be75ccfd1a/";
@@ -126,23 +125,19 @@ public static String getStyleUrl(@NotNull String scriptFileName) {
126125

127126
public static Url getFileUrl(OpenInBrowserRequest request, VirtualFile file) {
128127
Url url;
129-
try {
130-
StringBuilder sb = new StringBuilder();
131-
sb.append("http://localhost:").append(BuiltInServerManager.getInstance().getPort()).append(PREFIX);
132-
if (file instanceof LightVirtualFile) {
133-
throw new IllegalStateException("unable to create a URL from a in-memory file");
134-
}
135-
String mac = getBrowserPanel().signFile(file.getPath()).replaceAll("&amp;", "&");
136-
sb.append("source?file=").append(mac);
137-
if (request.getProject().getPresentableUrl() != null) {
138-
sb.append("&projectUrl=").append(URLEncoder.encode(request.getProject().getPresentableUrl(), StandardCharsets.UTF_8.toString()));
139-
} else {
140-
sb.append("&projectName=").append(URLEncoder.encode(request.getProject().getName(), StandardCharsets.UTF_8.toString()));
141-
}
142-
url = Urls.parseEncoded(sb.toString());
143-
} catch (UnsupportedEncodingException e) {
144-
throw new IllegalStateException("can't encode");
128+
StringBuilder sb = new StringBuilder();
129+
sb.append("http://localhost:").append(BuiltInServerManager.getInstance().getPort()).append(PREFIX);
130+
if (file instanceof LightVirtualFile) {
131+
throw new IllegalStateException("unable to create a URL from a in-memory file");
132+
}
133+
String mac = getBrowserPanel().signFile(file.getPath()).replaceAll("&amp;", "&");
134+
sb.append("source?file=").append(mac);
135+
if (request.getProject().getPresentableUrl() != null) {
136+
sb.append("&projectUrl=").append(URLEncoder.encode(request.getProject().getPresentableUrl(), StandardCharsets.UTF_8));
137+
} else {
138+
sb.append("&projectName=").append(URLEncoder.encode(request.getProject().getName(), StandardCharsets.UTF_8));
145139
}
140+
url = Urls.parseEncoded(sb.toString());
146141
if (request.isAppendAccessToken()) {
147142
url = BuiltInServerManager.getInstance().addAuthToken(Objects.requireNonNull(url));
148143
}
@@ -232,8 +227,8 @@ public boolean process(@NotNull QueryStringDecoder urlDecoder,
232227
}
233228
sendDocument(request, virtualFile, project, context.channel());
234229
} else if ("image".equals(action) && urlDecoder.parameters().get("file") != null && urlDecoder.parameters().get("mac") != null) {
235-
String file = urlDecoder.parameters().get("file").get(0);
236-
String mac = urlDecoder.parameters().get("mac").get(0);
230+
String file = urlDecoder.parameters().get("file").getFirst();
231+
String mac = urlDecoder.parameters().get("mac").getFirst();
237232
return sendImage(request, file, mac, context.channel());
238233
} else {
239234
return false;
@@ -248,7 +243,7 @@ private String getParameter(@NotNull QueryStringDecoder urlDecoder, @NotNull Str
248243
if (parameters == null || parameters.size() != 1) {
249244
return null;
250245
}
251-
return parameters.get(0);
246+
return parameters.getFirst();
252247
}
253248

254249
private boolean sendImage(FullHttpRequest request, String file, String mac, Channel channel) {

‎src/main/java/org/asciidoc/intellij/editor/jcef/AsciiDocJCEFHtmlPanel.java‎

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -151,35 +151,37 @@ public JComponent getPreferredFocusedComponent() {
151151
.append("<script src=\"").append(PreviewStaticServer.getScriptUrl("processImages.js")).append("\"></script>\n")
152152
.append("<script src=\"").append(PreviewStaticServer.getScriptUrl("pickSourceLine.js")).append("\"></script>\n")
153153
.append("<script src=\"").append(PreviewStaticServer.getScriptUrl("mouseEvents.js")).append("\"></script>\n")
154-
.append("<script type=\"text/x-mathjax-config\">\n" +
155-
"MathJax.Hub.Config({\n" +
156-
" messageStyle: \"none\",\n" +
157-
" EqnChunkDelay: 1," +
158-
" imageFont: null," +
159-
" tex2jax: {\n" +
160-
" inlineMath: [[\"\\\\(\", \"\\\\)\"]],\n" +
161-
" displayMath: [[\"\\\\[\", \"\\\\]\"]],\n" +
162-
" ignoreClass: \"nostem|nolatexmath\"\n" +
163-
" },\n" +
164-
" asciimath2jax: {\n" +
165-
" delimiters: [[\"\\\\$\", \"\\\\$\"]],\n" +
166-
" ignoreClass: \"nostem|noasciimath\"\n" +
167-
" },\n" +
168-
" TeX: { equationNumbers: { autoNumber: \"none\" } }\n" +
169-
"});\n" +
170-
"MathJax.Hub.Register.MessageHook(\"Math Processing Error\",function (message) {\n" +
171-
" window.JavaPanelBridge && window.JavaPanelBridge.log(JSON.stringify(message)); \n" +
172-
"});" +
173-
"MathJax.Hub.Register.MessageHook(\"TeX Jax - parse error\",function (message) {\n" +
174-
" var errortext = document.getElementById('mathjaxerrortext'); " +
175-
" var errorformula = document.getElementById('mathjaxerrorformula'); " +
176-
" if (errorformula && errortext) { " +
177-
" errortext.textContent = 'Math Formula problem: ' + message[1]; " +
178-
" errorformula.textContent = '\\n' + message[2]; " +
179-
" } " +
180-
" window.JavaPanelBridge && window.JavaPanelBridge.log(JSON.stringify(message)); \n" +
181-
"});" +
182-
"</script>\n")
154+
.append("""
155+
<script type="text/x-mathjax-config">
156+
MathJax.Hub.Config({
157+
messageStyle: "none",
158+
EqnChunkDelay: 1,
159+
imageFont: null,
160+
tex2jax: {
161+
inlineMath: [["\\\\(", "\\\\)"]],
162+
displayMath: [["\\\\[", "\\\\]"]],
163+
ignoreClass: "nostem|nolatexmath"
164+
},
165+
asciimath2jax: {
166+
delimiters: [["\\\\$", "\\\\$"]],
167+
ignoreClass: "nostem|noasciimath"
168+
},
169+
TeX: { equationNumbers: { autoNumber: "none" } }
170+
});
171+
MathJax.Hub.Register.MessageHook("Math Processing Error",function (message) {
172+
window.JavaPanelBridge && window.JavaPanelBridge.log(JSON.stringify(message));
173+
});
174+
MathJax.Hub.Register.MessageHook("TeX Jax - parse error",function (message) {
175+
var errortext = document.getElementById('mathjaxerrortext');
176+
var errorformula = document.getElementById('mathjaxerrorformula');
177+
if (errorformula && errortext) {
178+
errortext.textContent = 'Math Formula problem: ' + message[1];
179+
errorformula.textContent = '\\n' + message[2];
180+
}
181+
window.JavaPanelBridge && window.JavaPanelBridge.log(JSON.stringify(message));
182+
});
183+
</script>
184+
""")
183185
.append("<script src=\"").append(PreviewStaticServer.getScriptUrl("MathJax/MathJax.js")).append("&amp;config=TeX-MML-AM_HTMLorMML\"></script>\n")
184186
.toString();
185187
});
@@ -977,16 +979,12 @@ public void render() {
977979

978980
private boolean isDarcula() {
979981
final AsciiDocApplicationSettings settings = AsciiDocApplicationSettings.getInstance();
980-
switch (settings.getAsciiDocPreviewSettings().getPreviewTheme()) {
981-
case INTELLIJ:
982-
return !JBColor.isBright();
983-
case ASCIIDOC:
984-
return false;
985-
case DARCULA:
986-
return true;
987-
default:
988-
return false;
989-
}
982+
return switch (settings.getAsciiDocPreviewSettings().getPreviewTheme()) {
983+
case INTELLIJ -> !JBColor.isBright();
984+
case ASCIIDOC -> false;
985+
case DARCULA -> true;
986+
default -> false;
987+
};
990988
}
991989

992990

0 commit comments

Comments
 (0)