Skip to content

Commit 2023014

Browse files
committed
Merge remote-tracking branch 'origin/v203' into v211
# Conflicts: # src/main/java/com/joutvhu/intellij/dartscripts/LineMarkerActionWrapper.java # src/main/java/com/joutvhu/intellij/dartscripts/PubspecLineMarkerProvider.java # src/main/java/com/joutvhu/intellij/dartscripts/RunLineMarkerInfo.java
2 parents 947c070 + a3fd80a commit 2023014

File tree

4 files changed

+73
-9
lines changed

4 files changed

+73
-9
lines changed

CHANGELOG.md

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,69 @@
1+
## 1.221.1
2+
3+
- Fix "No such file or directory" on MacOS
4+
5+
## 1.213.2
6+
7+
- Fix "No such file or directory" on MacOS
8+
9+
## 1.212.2
10+
11+
- Fix "No such file or directory" on MacOS
12+
13+
## 1.211.2
14+
15+
- Fix "No such file or directory" on MacOS
16+
17+
## 1.203.1
18+
19+
- Fix "No such file or directory" on MacOS
20+
21+
## 1.202.1
22+
23+
- Fix "No such file or directory" on MacOS
24+
25+
## 1.201.1
26+
27+
- Fix "No such file or directory" on MacOS
28+
29+
## 1.221.0
30+
31+
- Support IDE version 2022.1
32+
33+
## 1.213.1
34+
35+
- Fix UserDataHolderBase.getUserData(com.intellij.execution.lineMarker.LineMarkerActionWrapper.LOCATION_WRAPPER) not found.
36+
37+
## 1.212.1
38+
39+
- Fix UserDataHolderBase.getUserData(com.intellij.execution.lineMarker.LineMarkerActionWrapper.LOCATION_WRAPPER) not found.
40+
41+
## 1.211.1
42+
43+
- Fix UserDataHolderBase.getUserData(com.intellij.execution.lineMarker.LineMarkerActionWrapper.LOCATION_WRAPPER) not found.
44+
45+
## 1.213.0
46+
47+
- Support IDE version 2021.3
48+
49+
## 1.212.0
50+
51+
- Support IDE version 2021.2
52+
153
## 1.211.0
254

355
- Run script on pubspec.yaml
456
- Edit Run Configuration
557
- Support IDE version 2021.1
58+
59+
## 1.203.0
60+
61+
- Support IDE version 2020.3
62+
63+
## 1.202.0
64+
65+
- Support IDE version 2020.2
66+
67+
## 1.201.0
68+
69+
- Support IDE version 2020.1

src/main/java/com/joutvhu/intellij/dartscripts/LineMarkerActionWrapper.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public LineMarkerActionWrapper(PsiElement element, @NotNull AnAction origin) {
4040
@Override
4141
public AnAction @NotNull [] getChildren(@Nullable AnActionEvent e) {
4242
if (myOrigin instanceof ExecutorAction) {
43-
if (((ExecutorAction)myOrigin).getOrigin() instanceof ExecutorRegistryImpl.ExecutorGroupActionGroup) {
44-
final AnAction[] children = ((ExecutorRegistryImpl.ExecutorGroupActionGroup)((ExecutorAction)myOrigin).getOrigin()).getChildren(null);
43+
if (((ExecutorAction) myOrigin).getOrigin() instanceof ExecutorRegistryImpl.ExecutorGroupActionGroup) {
44+
final AnAction[] children = ((ExecutorRegistryImpl.ExecutorGroupActionGroup) ((ExecutorAction) myOrigin).getOrigin()).getChildren(null);
4545
logger.assertTrue(ContainerUtil.all(Arrays.asList(children), o -> o instanceof RunContextAction));
4646
return ContainerUtil.mapNotNull(children, o -> {
4747
PsiElement element = myElement.getElement();
@@ -50,14 +50,14 @@ public LineMarkerActionWrapper(PsiElement element, @NotNull AnAction origin) {
5050
}
5151
}
5252
if (myOrigin instanceof ActionGroup) {
53-
return ((ActionGroup)myOrigin).getChildren(e == null ? null : wrapEvent(e));
53+
return ((ActionGroup) myOrigin).getChildren(e == null ? null : wrapEvent(e));
5454
}
5555
return AnAction.EMPTY_ARRAY;
5656
}
5757

5858
@Override
5959
public boolean canBePerformed(@NotNull DataContext context) {
60-
return !(myOrigin instanceof ActionGroup) || ((ActionGroup)myOrigin).canBePerformed(wrapContext(context));
60+
return !(myOrigin instanceof ActionGroup) || ((ActionGroup) myOrigin).canBePerformed(wrapContext(context));
6161
}
6262

6363
@Override
@@ -67,17 +67,17 @@ public boolean isDumbAware() {
6767

6868
@Override
6969
public boolean isPopup() {
70-
return !(myOrigin instanceof ActionGroup) || ((ActionGroup)myOrigin).isPopup();
70+
return !(myOrigin instanceof ActionGroup) || ((ActionGroup) myOrigin).isPopup();
7171
}
7272

7373
@Override
7474
public boolean hideIfNoVisibleChildren() {
75-
return myOrigin instanceof ActionGroup && ((ActionGroup)myOrigin).hideIfNoVisibleChildren();
75+
return myOrigin instanceof ActionGroup && ((ActionGroup) myOrigin).hideIfNoVisibleChildren();
7676
}
7777

7878
@Override
7979
public boolean disableIfNoVisibleChildren() {
80-
return !(myOrigin instanceof ActionGroup) || ((ActionGroup)myOrigin).disableIfNoVisibleChildren();
80+
return !(myOrigin instanceof ActionGroup) || ((ActionGroup) myOrigin).disableIfNoVisibleChildren();
8181
}
8282

8383
@Override

src/main/java/com/joutvhu/intellij/dartscripts/util/ShellStringUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ public String unquote(String afterSlash) {
3333

3434
static {
3535
ENCODED = toStr(ORIGIN_CHARS, '\\');
36-
ORIGINS = toStr(ORIGIN_CHARS, (Character)null);
36+
ORIGINS = toStr(ORIGIN_CHARS, (Character) null);
3737
}
3838
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<applicationService serviceInterface="com.joutvhu.intellij.dartscripts.run.DartScriptRunner"
3232
serviceImplementation="com.joutvhu.intellij.dartscripts.run.DartScriptTerminalRunner"/>
3333
<codeInsight.lineMarkerProvider language="yaml"
34-
implementationClass="com.joutvhu.intellij.dartscripts.PubspecLineMarkerProvider">
34+
implementationClass="com.joutvhu.intellij.dartscripts.PubspecLineMarkerProvider">
3535
</codeInsight.lineMarkerProvider>
3636
</extensions>
3737

0 commit comments

Comments
 (0)