Merge pull request #374 from shuzijun/gradle

shuzijun · web-flow · commit 14a47a560fec · 2021-08-17T20:05:42.000+08:00
fix bug
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/actions/toolbar/FindActionGroup.java b/src/main/java/com/shuzijun/leetcode/plugin/actions/toolbar/FindActionGroup.java
@@ -40,7 +40,9 @@ public void update(AnActionEvent e) {
             }
         }
         e.getPresentation().setIcon(null);
-        findToolbar.getComponent().updateUI();
+        if (findToolbar != null && findToolbar.getComponent() != null) {
+            findToolbar.getComponent().updateUI();
+        }
     }
 
 
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/actions/toolbar/SortAction.java b/src/main/java/com/shuzijun/leetcode/plugin/actions/toolbar/SortAction.java
@@ -39,7 +39,9 @@ public void update(@NotNull AnActionEvent e) {
         } else {
             e.getPresentation().setIcon(null);
         }
-        sortToolbar.getComponent().updateUI();
+        if (sortToolbar != null && sortToolbar.getComponent() != null) {
+            sortToolbar.getComponent().updateUI();
+        }
         super.update(e);
 
     }
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/editor/LCVPreview.java b/src/main/java/com/shuzijun/leetcode/plugin/editor/LCVPreview.java
@@ -68,8 +68,8 @@ public LCVPreview(@NotNull Project project, @NotNull VirtualFile file) {
             tempPanel = new LCVPanel(url, project);
             tempPanel.loadHTML(createHtml(isPresentableUrl), url);
             myHtmlPanelWrapper.add(tempPanel.getComponent(), BorderLayout.CENTER);
-        } catch (IllegalStateException e) {
-            myHtmlPanelWrapper.add(new JBLabel(e.getMessage()), BorderLayout.CENTER);
+        } catch (Throwable e) {
+            myHtmlPanelWrapper.add(new JBLabel("<html><body>Your environment does not support JCEF.<br>Check the Registry 'ide.browser.jcef.enabled'.<br>"+e.getMessage()+"<body></html>"), BorderLayout.CENTER);
         }
         myPanel = tempPanel;
         myHtmlPanelWrapper.repaint();
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/listener/SupportCheck.java b/src/main/java/com/shuzijun/leetcode/plugin/listener/SupportCheck.java
@@ -0,0 +1,30 @@
+package com.shuzijun.leetcode.plugin.listener;
+
+import com.intellij.notification.Notification;
+import com.intellij.notification.NotificationType;
+import com.intellij.notification.Notifications;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.startup.StartupActivity;
+import com.intellij.ui.jcef.JBCefApp;
+import com.shuzijun.leetcode.plugin.model.PluginConstant;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author shuzijun
+ */
+public class SupportCheck implements StartupActivity, DumbAware {
+
+    public static boolean isFirstProject = true;
+
+    @Override
+    public void runActivity(@NotNull Project project) {
+        if (ApplicationManager.getApplication().isUnitTestMode() ||  !isFirstProject ) {
+            return;
+        }
+        if(!JBCefApp.isSupported()){
+            Notifications.Bus.notify(new Notification(PluginConstant.NOTIFICATION_GROUP, "Not Support JCEF", "Your environment does not support JCEF, cannot use LeetCode Editor.Check the Registry 'ide.browser.jcef.enabled'.", NotificationType.ERROR));
+        }
+    }
+}
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/manager/CodeManager.java b/src/main/java/com/shuzijun/leetcode/plugin/manager/CodeManager.java
@@ -46,7 +46,7 @@ public static void openCode(Question question, Project project) {
         if (file.exists()) {
             FileUtils.openFileEditorAndSaveState(file,project,question,fillPath,true);
         } else {
-            if (config.getQuestionEditor() || getQuestion(question, codeTypeEnum, project)) {
+            if (getQuestion(question, codeTypeEnum, project)) {
                 question.setContent(CommentUtils.createComment(question.getContent(), codeTypeEnum,config));
                 FileUtils.saveFile(file, VelocityUtils.convert(config.getCustomTemplate(), question));
                 FileUtils.openFileEditorAndSaveState(file,project,question,fillPath,true);
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/utils/FileUtils.java b/src/main/java/com/shuzijun/leetcode/plugin/utils/FileUtils.java
@@ -34,6 +34,9 @@ public static void saveFile(String path, String body) {
 
     public static void saveFile(File file, String body) {
         try {
+            if (body == null) {
+                return;
+            }
             if (!file.getParentFile().exists()) {
                 file.getParentFile().mkdirs();
             }
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/window/HttpLogin.java b/src/main/java/com/shuzijun/leetcode/plugin/window/HttpLogin.java
@@ -82,6 +82,7 @@ public static boolean ajaxLogin(Config config, JTree tree, Project project) {
                     return Boolean.FALSE;
                 }
             } else if (response.getStatusCode() == 400) {
+                LogUtils.LOG.error("login 400:" + body);
                 JSONObject jsonObject = JSONObject.parseObject(body);
                 MessageUtils.getInstance(project).showInfoMsg("info", StringUtils.join(jsonObject.getJSONObject("form").getJSONArray("errors"), ","));
                 return Boolean.FALSE;
diff --git a/src/main/java/com/shuzijun/leetcode/plugin/window/JcefLogin.java b/src/main/java/com/shuzijun/leetcode/plugin/window/JcefLogin.java
@@ -68,13 +68,6 @@ public JCEFPanel(Project project) {
             loginJCEFPanel.loadURL(URLUtils.getLeetcodeLogin());
         }
 
-        @NotNull
-        @Override
-        protected Action getOKAction() {
-
-            return null;
-        }
-
         @NotNull
         @Override
         protected Action[] createActions() {
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -171,6 +171,7 @@
                   implementationClass="com.shuzijun.leetcode.plugin.editor.LCVFileType" fieldName="INSTANCE"/>
         <fileEditorProvider implementation="com.shuzijun.leetcode.plugin.editor.LCVProvider"/>
         <httpRequestHandler implementation="com.shuzijun.leetcode.plugin.editor.PreviewStaticServer"/>
+        <postStartupActivity implementation="com.shuzijun.leetcode.plugin.listener.SupportCheck"/>
     </extensions>
 
     <actions>

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,9 @@ public void update(AnActionEvent e) {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`e.getPresentation().setIcon(null);`
`43`		`- findToolbar.getComponent().updateUI();`
	`43`	`+ if (findToolbar != null && findToolbar.getComponent() != null) {`
	`44`	`+ findToolbar.getComponent().updateUI();`
	`45`	`+ }`
`44`	`46`	`}`
`45`	`47`
`46`	`48`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,9 @@ public void update(@NotNull AnActionEvent e) {`
`39`	`39`	`} else {`
`40`	`40`	`e.getPresentation().setIcon(null);`
`41`	`41`	`}`
`42`		`- sortToolbar.getComponent().updateUI();`
	`42`	`+ if (sortToolbar != null && sortToolbar.getComponent() != null) {`
	`43`	`+ sortToolbar.getComponent().updateUI();`
	`44`	`+ }`
`43`	`45`	`super.update(e);`
`44`	`46`
`45`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@ public static void saveFile(String path, String body) {`
`34`	`34`
`35`	`35`	`public static void saveFile(File file, String body) {`
`36`	`36`	`try {`
	`37`	`+ if (body == null) {`
	`38`	`+ return;`
	`39`	`+ }`
`37`	`40`	`if (!file.getParentFile().exists()) {`
`38`	`41`	`file.getParentFile().mkdirs();`
`39`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ public static boolean ajaxLogin(Config config, JTree tree, Project project) {`
`82`	`82`	`return Boolean.FALSE;`
`83`	`83`	`}`
`84`	`84`	`} else if (response.getStatusCode() == 400) {`
	`85`	`+ LogUtils.LOG.error("login 400:" + body);`
`85`	`86`	`JSONObject jsonObject = JSONObject.parseObject(body);`
`86`	`87`	`MessageUtils.getInstance(project).showInfoMsg("info", StringUtils.join(jsonObject.getJSONObject("form").getJSONArray("errors"), ","));`
`87`	`88`	`return Boolean.FALSE;`