diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index e0dd8d0..ef24987 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d9e04b..38b4a97 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
-
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 8a8b847..43ee428 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
}
group 'com.alekseyzhelo.evilislands'
-version '1.1'
+version '1.1.1'
sourceCompatibility = 1.8
tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
@@ -23,17 +23,35 @@ dependencies {
// See https://github.com/JetBrains/gradle-intellij-plugin/
intellij {
- version '2019.3'
+ version '2020.1'
type 'IC'
plugins 'java' //, 'PsiViewer:193-SNAPSHOT'
}
patchPluginXml {
changeNotes """
+ Version 1.1.1:
+
+ - Updated to work with Intellij 2020.1
+
+ Version 1.1:
- Implemented multiline comments
- Improved non-Java IDE support
- Error highlighting for unclosed strings/multiline comments
-
"""
+
+ Version 1.0:
+
+ - Syntax checking
+ - Type checking
+ - Code completion, including object ID/name completion and GSGetVar/GSSetVar variable completion
+ - Code formatting
+ - Basic code inspections
+ - Find usages
+ - Customizable syntax highlighting
+ - Structure view
+ - Live templates
+
+ """
sinceBuild '192'
}
diff --git a/src/main/java/com/alekseyzhelo/evilislands/mobplugin/projectView/EIMobPsiFileNode.java b/src/main/java/com/alekseyzhelo/evilislands/mobplugin/projectView/EIMobPsiFileNode.java
index 9ee5778..1a3e5f6 100644
--- a/src/main/java/com/alekseyzhelo/evilislands/mobplugin/projectView/EIMobPsiFileNode.java
+++ b/src/main/java/com/alekseyzhelo/evilislands/mobplugin/projectView/EIMobPsiFileNode.java
@@ -14,7 +14,7 @@
public class EIMobPsiFileNode extends PsiFileNode {
- private final List children;
+ private final List> children;
EIMobPsiFileNode(Project project, @NotNull PsiFile value, ViewSettings viewSettings, PsiFileNode scriptNode) {
super(project, value, viewSettings);
@@ -26,7 +26,7 @@ public class EIMobPsiFileNode extends PsiFileNode {
}
@Override
- public Collection getChildrenImpl() {
+ public Collection> getChildrenImpl() {
return children;
}
diff --git a/src/main/java/com/alekseyzhelo/evilislands/mobplugin/projectView/EIMobStructureProvider.java b/src/main/java/com/alekseyzhelo/evilislands/mobplugin/projectView/EIMobStructureProvider.java
index f9978f8..3241f76 100644
--- a/src/main/java/com/alekseyzhelo/evilislands/mobplugin/projectView/EIMobStructureProvider.java
+++ b/src/main/java/com/alekseyzhelo/evilislands/mobplugin/projectView/EIMobStructureProvider.java
@@ -19,7 +19,9 @@
public class EIMobStructureProvider implements TreeStructureProvider {
@NotNull
@Override
- public Collection modify(@NotNull AbstractTreeNode parent, @NotNull Collection children, ViewSettings settings) {
+ public Collection> modify(@NotNull AbstractTreeNode> parent,
+ @NotNull Collection> children,
+ ViewSettings settings) {
return children.stream()
.map((x) -> convertMobNode(x, children))
.filter(Objects::nonNull)
@@ -28,11 +30,12 @@ public Collection modify(@NotNull AbstractTreeNode parent, @No
@Nullable
@Override
- public Object getData(@NotNull Collection selected, @NotNull String dataId) {
+ public Object getData(@NotNull Collection> selected, @NotNull String dataId) {
return null;
}
- private AbstractTreeNode> convertMobNode(AbstractTreeNode> node, Collection siblings) {
+ private AbstractTreeNode> convertMobNode(AbstractTreeNode> node,
+ Collection> siblings) {
if (node instanceof PsiFileNode) {
VirtualFile virtualFile = ((PsiFileNode) node).getVirtualFile();
if (virtualFile != null) {
@@ -63,7 +66,7 @@ private AbstractTreeNode> convertMobNode(AbstractTreeNode> node, Collection<
@Nullable
private PsiFileNode findSameNamedSiblingOfType(
- Collection siblings,
+ Collection> siblings,
VirtualFile file,
FileType fileTypeInstance
) {
diff --git a/src/main/java/com/alekseyzhelo/evilislands/mobplugin/script/codeInsight/EIFunctionParameterInfoHandler.java b/src/main/java/com/alekseyzhelo/evilislands/mobplugin/script/codeInsight/EIFunctionParameterInfoHandler.java
index d6148af..d56f400 100644
--- a/src/main/java/com/alekseyzhelo/evilislands/mobplugin/script/codeInsight/EIFunctionParameterInfoHandler.java
+++ b/src/main/java/com/alekseyzhelo/evilislands/mobplugin/script/codeInsight/EIFunctionParameterInfoHandler.java
@@ -19,9 +19,9 @@
public class EIFunctionParameterInfoHandler implements ParameterInfoHandlerWithTabActionSupport, EIExpression>, DumbAware {
- private static final Set ourArgumentListAllowedParentClassesSet
+ private static final Set> ourArgumentListAllowedParentClassesSet
= ContainerUtil.newHashSet(EIFunctionCall.class);
- private static final Set ourStopSearch = Collections.singleton(EIScriptBlock.class);
+ private static final Set> ourStopSearch = Collections.singleton(EIScriptBlock.class);
@Override
public boolean couldShowInLookup() {
@@ -130,13 +130,13 @@ public IElementType getActualParametersRBraceType() {
@NotNull
@Override
- public Set getArgumentListAllowedParentClasses() {
+ public Set> getArgumentListAllowedParentClasses() {
return ourArgumentListAllowedParentClassesSet;
}
@NotNull
@Override
- public Set extends Class> getArgListStopSearchClasses() {
+ public Set extends Class>> getArgListStopSearchClasses() {
return ourStopSearch;
}