Merge pull request #630

Support 2020.2
JetBrains · Jul 31, 2020 · 8ee36a6 · 8ee36a6
2 parents c9734dc + e26422c
commit 8ee36a6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'jacoco'
-    id 'org.jetbrains.intellij' version '0.4.17'
+    id 'org.jetbrains.intellij' version '0.4.21'
     id 'de.undercouch.download' version '4.0.0'
     id 'com.github.kt3k.coveralls' version '2.8.4'
 }

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # https://www.jetbrains.com/intellij-repository/releases
 # https://www.jetbrains.com/intellij-repository/snapshots
 
-ideaVersion = 201.6668.113
+ideaVersion = 202.6397.94
 ideaType = IC
 javaVersion = 1.8
 javaTargetVersion = 1.8
@@ -12,9 +12,9 @@ runGenerators = true
 
 pluginGroup = mobi.hsz.idea
 pluginName = .ignore
-pluginVersion = 3.2.3.201
-pluginSinceBuild = 201
-pluginUntilBuild = 202
+pluginVersion = 3.2.3.202
+pluginSinceBuild = 202
+pluginUntilBuild = 203
 
 publishPluginId = 7495
 publishUsername = hsz

diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -79,7 +79,7 @@
         <i>Notable changes since 3.2.3</i>
 
         <ul>
-            <li>Compatibility with 2020.1</li>
+            <li>Compatibility with 2020.2</li>
         </ul>
 
         <a href="https://github.com/JetBrains/idea-gitignore/blob/master/CHANGELOG.md"><b>Full Changelog History</b></a>

diff --git a/resources/gitignore b/resources/gitignore
diff --git a/src/mobi/hsz/idea/gitignore/daemon/IgnoreDirectoryMarkerProvider.java b/src/mobi/hsz/idea/gitignore/daemon/IgnoreDirectoryMarkerProvider.java
@@ -100,14 +100,4 @@ public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement element) {
         }
         return null;
     }
-
-    /**
-     * Mocked method.
-     *
-     * @param elements unused parameter
-     * @param result   unused parameter
-     */
-    @Override
-    public void collectSlowLineMarkers(@NotNull List<PsiElement> elements, @NotNull Collection<LineMarkerInfo> result) {
-    }
 }
+3 −0		Android.gitignore
+3 −0		Dart.gitignore
+1 −1		Global/README.md
+0 −1		Godot.gitignore
+2 −1		Gradle.gitignore
+2 −0		KiCad.gitignore
+2 −1		Node.gitignore
+0 −1		Python.gitignore
+3 −0		R.gitignore
+2 −1		Rust.gitignore
+3 −0		TeX.gitignore
+5 −4		Terraform.gitignore
+1 −0		Unity.gitignore
+6 −1		VisualStudio.gitignore