Merge pull request #1 from ranbest/123

123

Author: bestv5

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        maven { url 'http://dl.bintray.com/jetbrains/intellij-plugin-service' }
+        maven { url 'https://dl.bintray.com/jetbrains/intellij-plugin-service' }
         mavenCentral()
     }
     dependencies {
@@ -9,7 +9,14 @@ buildscript {
 }
 
 plugins {
-    id "org.jetbrains.intellij" version "0.2.5"
+    id "org.jetbrains.intellij" version "1.0"
+}
+
+intellij {
+    version 'IC-2020.3'
+//        plugins 'coverage'
+//        pluginName 'CodeGlance'
+    updateSinceUntilBuild = false
 }
 
 allprojects {
@@ -21,10 +28,11 @@ allprojects {
     tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
 
     apply plugin: 'org.jetbrains.intellij'
+
     intellij {
-        version ideaVersion
-        plugins 'coverage'
-        pluginName 'CodeGlance'
+        version 'IC-2020.3'
+//        plugins 'coverage'
+//        pluginName 'CodeGlance'
         updateSinceUntilBuild = false
     }
 
@@ -47,6 +55,6 @@ dependencies {
     testCompile "org.testng:testng:6.8.5"
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '3.3'
+wrapper {
+    gradleVersion = '7.0.2'
 }

gradle.properties

@@ -1,4 +1,4 @@
-ideaVersion = IC-14.1.4
-javaVersion = 1.6
-kotlinVersion = 1.0.5
-version = 1.5.4
+ideaVersion = IC-2021.1.0
+javaVersion = 1.8
+kotlinVersion = 1.4.32
+version = 1.5.5

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip

src/main/java/net/vektah/codeglance/GlancePanel.kt

@@ -48,7 +48,8 @@ import java.lang.ref.SoftReference
 /**
  * This JPanel gets injected into editor windows and renders a image generated by GlanceFileRenderer
  */
-class GlancePanel(private val project: Project, fileEditor: FileEditor, private val container: JPanel, private val runner: TaskRunner) : JPanel(), VisibleAreaListener {
+class GlancePanel(private val project: Project, fileEditor: FileEditor, private val container: JPanel, private val runner: TaskRunner) : JPanel(),
+    VisibleAreaListener {
     private val editor = (fileEditor as TextEditor).editor
     private var mapRef = SoftReference<Minimap>(null)
     private val configService = ServiceManager.getService(ConfigService::class.java)
@@ -62,7 +63,7 @@ class GlancePanel(private val project: Project, fileEditor: FileEditor, private
     // Anonymous Listeners that should be cleaned up.
     private val componentListener: ComponentListener
     private val documentListener: DocumentListener
-    private val selectionListener: SelectionListener = SelectionListener { repaint() }
+    private val selectionListener: SelectionListener
 
     private val isDisabled: Boolean
         get() = config.disabled || editor.document.textLength > config.maxFileSize || editor.document.lineCount < config.minLineCount || container.width < config.minWindowWidth
@@ -85,8 +86,8 @@ class GlancePanel(private val project: Project, fileEditor: FileEditor, private
         }
         container.addComponentListener(componentListener)
 
-        documentListener = object : DocumentAdapter() {
-            override fun documentChanged(documentEvent: DocumentEvent?) {
+        documentListener = object : DocumentListener {
+            override fun documentChanged(event: DocumentEvent) {
                 updateImage()
             }
         }
@@ -96,6 +97,12 @@ class GlancePanel(private val project: Project, fileEditor: FileEditor, private
 
         editor.scrollingModel.addVisibleAreaListener(this)
 
+        selectionListener = object :SelectionListener{
+            override fun selectionChanged(e: SelectionEvent) {
+                repaint()
+            }
+        }
+
         editor.selectionModel.addSelectionListener(selectionListener)
         updateSize()
         updateImage()
@@ -120,7 +127,7 @@ class GlancePanel(private val project: Project, fileEditor: FileEditor, private
 
     // the minimap is held by a soft reference so the GC can delete it at any time.
     // if its been deleted and we want it again (active tab) we recreate it.
-    private fun getOrCreateMap() : Minimap? {
+    private fun getOrCreateMap(): Minimap? {
         var map = mapRef.get()
 
         if (map == null) {
@@ -170,10 +177,12 @@ class GlancePanel(private val project: Project, fileEditor: FileEditor, private
 
 
         if (buf != null) {
-            g.drawImage(buf,
+            g.drawImage(
+                buf,
                 0, 0, buf!!.width, buf!!.height,
                 0, 0, buf!!.width, buf!!.height,
-                null)
+                null
+            )
         }
         paintSelections(g)
         scrollbar.paint(gfx)
@@ -251,7 +260,7 @@ class GlancePanel(private val project: Project, fileEditor: FileEditor, private
     }
 
     private fun paintSelections(g: Graphics2D) {
-       paintSelection(g, editor.selectionModel.selectionStart, editor.selectionModel.selectionEnd)
+        paintSelection(g, editor.selectionModel.selectionStart, editor.selectionModel.selectionEnd)
 
         for ((index, start) in editor.selectionModel.blockSelectionStarts.withIndex()) {
             paintSelection(g, start, editor.selectionModel.blockSelectionEnds[index])

src/main/java/net/vektah/codeglance/config/ConfigService.kt

@@ -7,7 +7,7 @@ import java.lang.ref.WeakReference
 @State(
         name = "CodeGlance",
         storages = arrayOf(
-            Storage(id = "other", file = StoragePathMacros.APP_CONFIG + "/CodeGlance.xml")
+            Storage(value = StoragePathMacros.WORKSPACE_FILE + "/CodeGlance.xml")
         )
 )
 class ConfigService : PersistentStateComponent<Config> {

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

@@ -1,7 +1,7 @@
 <idea-plugin url="https://github.com/Vektah/CodeGlance">
 	<id>net.vektah.codeglance</id>
-	<name>CodeGlance</name>
-	<version>1.5.4</version>
+	<name>CodeGlance3</name>
+	<version>1.5.5</version>
 	<vendor email="adam@vektah.net" url="https://github.com/Vektah/CodeGlance">Vektah</vendor>
 
 	<description>
@@ -10,6 +10,10 @@
 	</description>
 
 	<change-notes><![CDATA[
+		<h3>1.5.5</h3>
+		<ul>
+			<li>update to 2020.3</li>
+		</ul>
 		<h3>1.5.4</h3>
 		<ul>
 			<li>Bugfix: Viewport position now calculates correctly for large files -@ru5k</li>