Skip to content

Commit 21e011c

Browse files
authored
Merge pull request #225 from shuzijun/gradle
fix bugs
2 parents e9bdf1f + 8a47152 commit 21e011c

File tree

5 files changed

+18
-7
lines changed

5 files changed

+18
-7
lines changed

src/main/java/com/shuzijun/leetcode/plugin/actions/editor/OpenSolutionAction.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ public class OpenSolutionAction extends AbstractEditAction {
2323
@Override
2424
public void update(@NotNull AnActionEvent anActionEvent) {
2525
VirtualFile vf = anActionEvent.getData(PlatformDataKeys.VIRTUAL_FILE);
26+
if (vf == null) {
27+
return;
28+
}
2629
LeetcodeEditor leetcodeEditor = ProjectConfig.getInstance(anActionEvent.getProject()).getEditor(vf.getPath());
2730
if (leetcodeEditor == null) {
2831
return;

src/main/java/com/shuzijun/leetcode/plugin/actions/editor/PositionAction.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ public class PositionAction extends AbstractEditAction {
2525

2626
@Override
2727
public void update(@NotNull AnActionEvent e) {
28+
if (e.getProject() == null) {
29+
return;
30+
}
2831
VirtualFile vf = ArrayUtil.getFirstElement(FileEditorManager.getInstance(e.getProject()).getSelectedFiles());
2932
if (vf == null) {
3033
e.getPresentation().setEnabled(false);

src/main/java/com/shuzijun/leetcode/plugin/manager/SubmissionManager.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ public static void openSubmission(Submission submission, Question question, Proj
120120
sb.append(codeTypeEnum.getComment()).append("expected_output:").append(submissionData.getString("expected_output")).append("\n");
121121
sb.append(codeTypeEnum.getComment()).append("code_output:").append(submissionData.getString("code_output")).append("\n");
122122
sb.append(codeTypeEnum.getComment()).append("runtime_error:").append(submissionData.getString("runtime_error")).append("\n");
123-
sb.append(codeTypeEnum.getComment()).append("last_testcase:").append(submissionData.getString("last_testcase").replaceAll("(\\r|\\r\\n|\\n\\r|\\n)", " ")).append("\n");
124-
123+
if(submissionData.containsKey("last_testcase")) {
124+
sb.append(codeTypeEnum.getComment()).append("last_testcase:").append(submissionData.getString("last_testcase").replaceAll("(\\r|\\r\\n|\\n\\r|\\n)", " ")).append("\n");
125+
}
125126
}
126127
FileUtils.saveFile(file, sb.toString());
127128
FileUtils.openFileEditor(file,project);

src/main/java/com/shuzijun/leetcode/plugin/utils/FileUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public Boolean compute() throws Throwable {
138138
codeList.add(line);
139139
lineCount++;
140140
}
141-
if (codeBegins.size() == codeBegins.size() && codeBegins.size() > 0) {
141+
if (codeBegins.size() == codeEnds.size() && codeBegins.size() > 0) {
142142
for (int s = 0; s < codeBegins.size(); s++) {
143143
for (int i = codeBegins.get(s) + 1; i < codeEnds.get(s); i++) {
144144
code.append(codeList.get(i)).append("\n");

src/main/java/com/shuzijun/leetcode/plugin/window/LoginFrame.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,14 @@ public void actionPerformed(ActionEvent e) {
175175
for (String cookieString : cookies) {
176176
String[] cookie = cookieString.trim().split("=");
177177
if (cookie.length >= 2) {
178-
HttpCookie basicClientCookie = new HttpCookie(cookie[0], cookie[1]);
179-
basicClientCookie.setDomain("." + URLUtils.getLeetcodeHost());
180-
basicClientCookie.setPath("/");
181-
cookieList.add(basicClientCookie);
178+
try {
179+
HttpCookie basicClientCookie = new HttpCookie(cookie[0], cookie[1]);
180+
basicClientCookie.setDomain("." + URLUtils.getLeetcodeHost());
181+
basicClientCookie.setPath("/");
182+
cookieList.add(basicClientCookie);
183+
}catch (IllegalArgumentException ignore){
184+
185+
}
182186
}
183187
}
184188
HttpRequestUtils.setCookie(cookieList);

0 commit comments

Comments
 (0)