Skip to content

Commit c353a41

Browse files
chuntunghochuntungho
committed
fix for IC 2024
1 parent 1694ab9 commit c353a41

14 files changed

+157
-25
lines changed

‎build.gradle

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ buildscript {
66
}
77

88
plugins {
9-
id 'org.jetbrains.intellij' version '1.2.1'
9+
id 'org.jetbrains.intellij' version '1.10.2'
1010
}
1111

1212
group 'com.chuntung.plugin'
1313
version "${version}"
1414

1515
sourceCompatibility = JavaVersion.VERSION_1_8
16+
[compileJava,compileTestJava,javadoc]*.options*.encoding = 'UTF-8'
1617

1718
repositories {
1819
mavenLocal()
@@ -23,14 +24,14 @@ dependencies {
2324
// https://mvnrepository.com/artifact/org.kohsuke/github-api
2425
implementation(files("libs/github-api-1.309-SNAPSHOT.jar"))
2526

26-
testCompile group: 'junit', name: 'junit', version: '4.12'
27+
testImplementation group: 'junit', name: 'junit', version: '4.12'
2728
}
2829

2930
// See https://github.com/JetBrains/gradle-intellij-plugin/
3031
intellij {
3132
pluginName = "Gist Snippet"
3233
version = ideaVersion
33-
plugins = ["github"]
34+
plugins = ["org.jetbrains.plugins.github"]
3435
sameSinceUntilBuild = Boolean.valueOf(isEAP)
3536
patchPluginXml {
3637
untilBuild = customUtilBuild

‎changeNotes.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<ul>
2-
<li>Use github-api rather than intellij github plugin</li>
2+
<li>Fix for IC 2024</li>
33
</ul>

‎gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
version = 1.1.0
2-
ideaVersion = IC-2019.1
1+
version = 1.2.0
2+
ideaVersion = IC-2023.1
33
customUtilBuild = 299.*
44
isEAP = false
55
pluginChannels = nightly

‎gradle/wrapper/gradle-wrapper.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jan 03 09:29:20 CST 2020
2-
distributionUrl=https\://downloads.gradle-dn.com/distributions/gradle-6.8.3-bin.zip
1+
#Mon Apr 29 10:48:50 CST 2024
32
distributionBase=GRADLE_USER_HOME
43
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
65
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

‎src/main/java/com/chuntung/plugin/gistsnippet/action/AddAction.java

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
package com.chuntung.plugin.gistsnippet.action;
66

7+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
78
import com.intellij.openapi.actionSystem.AnAction;
89
import com.intellij.openapi.actionSystem.AnActionEvent;
910
import org.jetbrains.annotations.NotNull;
@@ -17,4 +18,8 @@ public class AddAction extends AnAction {
1718
public void actionPerformed(@NotNull AnActionEvent e) {
1819
// TODO check selected file or path or text, pass them to dialog
1920
}
21+
22+
public @NotNull ActionUpdateThread getActionUpdateThread() {
23+
return ActionUpdateThread.EDT;
24+
}
2025
}

‎src/main/java/com/chuntung/plugin/gistsnippet/action/CustomComboBoxAction.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44

55
package com.chuntung.plugin.gistsnippet.action;
66

7-
import com.intellij.openapi.actionSystem.AnAction;
8-
import com.intellij.openapi.actionSystem.AnActionEvent;
9-
import com.intellij.openapi.actionSystem.DefaultActionGroup;
10-
import com.intellij.openapi.actionSystem.Presentation;
7+
import com.intellij.openapi.actionSystem.*;
118
import com.intellij.openapi.actionSystem.ex.ComboBoxAction;
129
import com.intellij.openapi.project.DumbAware;
1310
import org.jetbrains.annotations.NotNull;
@@ -34,6 +31,10 @@ public CustomComboBoxAction(AnAction... actions) {
3431
}
3532
}
3633

34+
public @NotNull ActionUpdateThread getActionUpdateThread() {
35+
return ActionUpdateThread.EDT;
36+
}
37+
3738
public void update(@NotNull AnActionEvent e) {
3839
if (e.getPresentation() != null) {
3940
e.getPresentation().setText(myText);

‎src/main/java/com/chuntung/plugin/gistsnippet/action/DeleteAction.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.chuntung.plugin.gistsnippet.dto.SnippetRootNode;
1010
import com.chuntung.plugin.gistsnippet.service.GistSnippetService;
1111
import com.chuntung.plugin.gistsnippet.service.GithubAccountHolder;
12+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
1213
import com.intellij.openapi.actionSystem.AnAction;
1314
import com.intellij.openapi.actionSystem.AnActionEvent;
1415
import com.intellij.openapi.progress.ProgressIndicator;
@@ -18,7 +19,6 @@
1819
import com.intellij.openapi.ui.MessageDialogBuilder;
1920
import com.intellij.ui.tree.StructureTreeModel;
2021
import org.jetbrains.annotations.NotNull;
21-
import org.jetbrains.plugins.github.authentication.accounts.GithubAccount;
2222

2323
import javax.swing.*;
2424
import javax.swing.tree.DefaultMutableTreeNode;
@@ -105,4 +105,8 @@ public void update(@NotNull AnActionEvent event) {
105105

106106
event.getPresentation().setVisible(false);
107107
}
108+
109+
public @NotNull ActionUpdateThread getActionUpdateThread() {
110+
return ActionUpdateThread.EDT;
111+
}
108112
}

‎src/main/java/com/chuntung/plugin/gistsnippet/action/EditAction.java

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
package com.chuntung.plugin.gistsnippet.action;
66

7+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
78
import com.intellij.openapi.actionSystem.AnAction;
89
import com.intellij.openapi.actionSystem.AnActionEvent;
910
import org.jetbrains.annotations.NotNull;
@@ -16,4 +17,8 @@ public class EditAction extends AnAction {
1617
public void actionPerformed(@NotNull AnActionEvent e) {
1718

1819
}
20+
21+
public @NotNull ActionUpdateThread getActionUpdateThread() {
22+
return ActionUpdateThread.EDT;
23+
}
1924
}

‎src/main/java/com/chuntung/plugin/gistsnippet/action/InsertAction.java

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import com.chuntung.plugin.gistsnippet.view.InsertGistDialog;
88
import com.intellij.icons.AllIcons;
9+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
910
import com.intellij.openapi.actionSystem.AnAction;
1011
import com.intellij.openapi.actionSystem.AnActionEvent;
1112
import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -81,4 +82,8 @@ public void update(@NotNull AnActionEvent event) {
8182
event.getPresentation().setVisible(false);
8283
}
8384
}
85+
86+
public @NotNull ActionUpdateThread getActionUpdateThread() {
87+
return ActionUpdateThread.EDT;
88+
}
8489
}

‎src/main/java/com/chuntung/plugin/gistsnippet/action/OpenInBrowserAction.java

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.chuntung.plugin.gistsnippet.dto.FileNodeDTO;
88
import com.chuntung.plugin.gistsnippet.dto.SnippetNodeDTO;
99
import com.intellij.ide.BrowserUtil;
10+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
1011
import com.intellij.openapi.actionSystem.AnActionEvent;
1112
import com.intellij.openapi.project.DumbAwareAction;
1213
import org.jetbrains.annotations.NotNull;
@@ -40,4 +41,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
4041
BrowserUtil.open(url);
4142
}
4243
}
44+
45+
public @NotNull ActionUpdateThread getActionUpdateThread() {
46+
return ActionUpdateThread.EDT;
47+
}
4348
}

‎src/main/java/com/chuntung/plugin/gistsnippet/action/ReloadAction.java

+5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package com.chuntung.plugin.gistsnippet.action;
66

77
import com.chuntung.plugin.gistsnippet.dto.FileNodeDTO;
8+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
89
import com.intellij.openapi.actionSystem.AnAction;
910
import com.intellij.openapi.actionSystem.AnActionEvent;
1011
import com.intellij.openapi.project.DumbAware;
@@ -40,4 +41,8 @@ public void update(@NotNull AnActionEvent e) {
4041
e.getPresentation().setVisible(false);
4142
}
4243
}
44+
45+
public @NotNull ActionUpdateThread getActionUpdateThread() {
46+
return ActionUpdateThread.EDT;
47+
}
4348
}

‎src/main/java/com/chuntung/plugin/gistsnippet/service/GistSnippetService.java

+12-10
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
import com.intellij.openapi.components.ServiceManager;
88
import com.intellij.openapi.diagnostic.Logger;
99
import com.intellij.util.containers.ContainerUtil;
10-
import org.kohsuke.github.GHGist;
11-
import org.kohsuke.github.GitHub;
12-
import org.kohsuke.github.GitHubBuilder;
13-
import org.kohsuke.github.PagedIterable;
10+
import org.kohsuke.github.*;
1411

1512
import java.io.IOException;
1613
import java.util.ArrayList;
@@ -24,6 +21,8 @@
2421
public class GistSnippetService {
2522
private static final Logger logger = Logger.getInstance(GistSnippetService.class);
2623

24+
private final GithubHelper githubHelper = new GithubHelper();
25+
2726
// cache in memory, can be collected
2827
private Map<String, List<String>> scopeCache = ContainerUtil.createConcurrentSoftValueMap();
2928
private Map<String, GHGist> gistCache = ContainerUtil.createConcurrentSoftValueMap();
@@ -43,12 +42,13 @@ public List<GHGist> queryOwnGist(String token, boolean forced) {
4342
AtomicReference<List<GHGist>> result = new AtomicReference<>();
4443
List<String> idList = scopeCache.computeIfAbsent(key, (k) -> {
4544
try {
46-
GitHub github = new GitHubBuilder().withOAuthToken(token).build();
45+
GitHub github = githubHelper.getClient(token);
4746
PagedIterable<GHGist> pagedResult = github.listGists();
4847
List<GHGist> ghGists = pagedResult.toList();
4948
result.set(ghGists);
5049
return putIntoCache(ghGists);
5150
} catch (IOException e) {
51+
githubHelper.logError();
5252
logger.info("Failed to query own gists, error: " + e.getMessage());
5353
throw new GistException(e);
5454
}
@@ -103,7 +103,7 @@ public List<GHGist> queryStarredGist(String token, boolean forced) {
103103
List<String> cacheList = scopeCache.computeIfAbsent(key, (k) -> {
104104
try {
105105
// TODO starred gists
106-
GitHub github = new GitHubBuilder().withOAuthToken(token).build();
106+
GitHub github = githubHelper.getClient(token);
107107
PagedIterable<GHGist> pagedResult = github.listStarredGists();
108108
List<GHGist> gistList = pagedResult.toList();
109109
result.set(gistList);
@@ -126,7 +126,7 @@ public List<GHGist> queryPublicGists(String keyword) {
126126
/**
127127
* @param token
128128
* @param gistId
129-
* @param forced true to load file content from remote server
129+
* @param forced true to load file content from remote server
130130
* @return
131131
*/
132132
public GHGist getGistDetail(String token, String gistId, boolean forced) {
@@ -136,9 +136,10 @@ public GHGist getGistDetail(String token, String gistId, boolean forced) {
136136

137137
return gistCache.computeIfAbsent(gistId, (k) -> {
138138
try {
139-
GitHub github = new GitHubBuilder().withOAuthToken(token).build();
139+
GitHub github = githubHelper.getClient(token);
140140
return github.getGist(gistId);
141141
} catch (IOException e) {
142+
githubHelper.logError();
142143
logger.info("Failed to get gist detail, error: " + e.getMessage());
143144
throw new GistException(e);
144145
}
@@ -148,7 +149,7 @@ public GHGist getGistDetail(String token, String gistId, boolean forced) {
148149
public void deleteGist(String token, List<String> gistIds) {
149150
try {
150151
for (String gistId : gistIds) {
151-
GitHub github = new GitHubBuilder().withOAuthToken(token).build();
152+
GitHub github = githubHelper.getClient(token);
152153
github.deleteGist(gistId);
153154
gistCache.remove(gistId);
154155
}
@@ -158,8 +159,9 @@ public void deleteGist(String token, List<String> gistIds) {
158159
cacheList.removeAll(gistIds);
159160
}
160161
} catch (IOException e) {
162+
githubHelper.logError();
161163
logger.info("Failed to delete gist, error: " + e.getMessage());
162164
throw new GistException(e);
163165
}
164166
}
165-
}
167+
}

‎src/main/java/com/chuntung/plugin/gistsnippet/service/GithubHelper.java

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
package com.chuntung.plugin.gistsnippet.service;
2+
3+
import org.kohsuke.github.GitHub;
4+
import org.kohsuke.github.GitHubBuilder;
5+
import org.kohsuke.github.connector.GitHubConnector;
6+
import org.kohsuke.github.connector.GitHubConnectorRequest;
7+
import org.kohsuke.github.connector.GitHubConnectorResponse;
8+
9+
import java.io.IOException;
10+
import java.io.InputStream;
11+
import java.util.HashMap;
12+
import java.util.List;
13+
import java.util.Map;
14+
import java.util.concurrent.ConcurrentHashMap;
15+
import java.util.concurrent.ConcurrentMap;
16+
import java.util.concurrent.atomic.AtomicLong;
17+
import java.util.stream.Collectors;
18+
19+
public class GithubHelper {
20+
private static final String fallbackEndpoint = "https://api-github-com.chuntung.com";
21+
22+
private final ConcurrentMap<String, GitHub> clientCache = new ConcurrentHashMap<>();
23+
private final AtomicLong errorCount = new AtomicLong(0);
24+
25+
public GithubHelper(){
26+
}
27+
28+
public void logError() {
29+
errorCount.incrementAndGet();
30+
clientCache.clear();
31+
}
32+
33+
public GitHub getClient(String token) throws IOException {
34+
GitHub gitHub = clientCache.computeIfAbsent(token, k -> {
35+
GitHubBuilder gitHubBuilder = new GitHubBuilder()
36+
.withOAuthToken(token);
37+
if (errorCount.get() >= 3) {
38+
gitHubBuilder.withEndpoint(fallbackEndpoint)
39+
.withConnector(new FallbackGitHubConnector(GitHubConnector.DEFAULT));
40+
}
41+
try {
42+
return gitHubBuilder.build();
43+
} catch (IOException e) {
44+
return null;
45+
}
46+
});
47+
if (gitHub == null) {
48+
throw new IOException("Failed to init github client");
49+
}
50+
return gitHub;
51+
}
52+
53+
private static class FallbackGitHubConnector implements GitHubConnector {
54+
private GitHubConnector delegate;
55+
56+
public FallbackGitHubConnector(GitHubConnector delegate) {
57+
this.delegate = delegate;
58+
}
59+
60+
@Override
61+
public GitHubConnectorResponse send(GitHubConnectorRequest gitHubConnectorRequest) throws IOException {
62+
return new FallbackGitHubConnectorResponse(gitHubConnectorRequest, delegate.send(gitHubConnectorRequest));
63+
}
64+
}
65+
66+
private static class FallbackGitHubConnectorResponse extends GitHubConnectorResponse {
67+
private final GitHubConnectorResponse response;
68+
69+
protected FallbackGitHubConnectorResponse(GitHubConnectorRequest request, GitHubConnectorResponse response) {
70+
super(request, response.statusCode(), resolveLink(response.allHeaders()));
71+
this.response = response;
72+
}
73+
74+
private static Map<String, List<String>> resolveLink(Map<String, List<String>> headers) {
75+
List<String> link = headers.get("Link");
76+
if (link != null) {
77+
List<String> resolved = link.stream()
78+
.map(x -> x.replace("https://api.github.com", fallbackEndpoint))
79+
.collect(Collectors.toList());
80+
if (!resolved.isEmpty()) {
81+
HashMap<String, List<String>> newMap = new HashMap<String, List<String>>(headers);
82+
newMap.put("Link", resolved);
83+
return newMap;
84+
}
85+
}
86+
return headers;
87+
}
88+
89+
@Override
90+
public InputStream bodyStream() throws IOException {
91+
return response.bodyStream();
92+
}
93+
94+
@Override
95+
public void close() throws IOException {
96+
response.close();
97+
}
98+
}
99+
}

‎src/main/resources/META-INF/plugin.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<vendor email="[email protected]" url="https://gist.chuntung.com">Chuntung Ho</vendor>
99

1010
<description><![CDATA[
11-
<a href="https://gist.chuntung.com">Getting Started</a> | <a href="https://chuntung.com/donate">Donate</a>
11+
<a href="https://plugins.jetbrains.com/plugin/13587-gist-snippet/getting-started">Getting Started</a>
1212
<br><br>
1313
A code snippet tool based on GitHub Gist, that provides with a feature to fetch own or starred gists of GitHub accounts.
1414
It depends on built-in GitHub plugin which should be enabled.

0 commit comments

Comments
 (0)