From effc24d500dfe7f0a097a2410ffcc485e6c07933 Mon Sep 17 00:00:00 2001 From: lixuran Date: Tue, 15 Jun 2021 09:18:02 +0800 Subject: [PATCH 1/4] 123 --- build.gradle | 15 ++++++++------- gradle.properties | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- .../java/net/vektah/codeglance/GlancePanel.kt | 4 ++-- .../net/vektah/codeglance/config/ConfigService.kt | 2 +- src/main/resources/META-INF/plugin.xml | 2 +- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 3f2135e..431f7d8 100644 --- a/build.gradle +++ b/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,7 @@ buildscript { } plugins { - id "org.jetbrains.intellij" version "0.2.5" + id "org.jetbrains.intellij" version "1.0" } allprojects { @@ -21,10 +21,11 @@ allprojects { tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } apply plugin: 'org.jetbrains.intellij' + intellij { - version ideaVersion - plugins 'coverage' - pluginName 'CodeGlance' + version 'IC-2021.1' +// plugins 'coverage' +// pluginName 'CodeGlance' updateSinceUntilBuild = false } @@ -47,6 +48,6 @@ dependencies { testCompile "org.testng:testng:6.8.5" } -task wrapper(type: Wrapper) { - gradleVersion = '3.3' +wrapper { + gradleVersion = '7.0.2' } diff --git a/gradle.properties b/gradle.properties index beb3d04..23c4193 100644 --- a/gradle.properties +++ b/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 +javaVersion = 1.8 +kotlinVersion = 1.4.32 +version = 1.5.5 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 71a03a6..b17c86e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/src/main/java/net/vektah/codeglance/GlancePanel.kt b/src/main/java/net/vektah/codeglance/GlancePanel.kt index 9c8f6af..35d4b46 100644 --- a/src/main/java/net/vektah/codeglance/GlancePanel.kt +++ b/src/main/java/net/vektah/codeglance/GlancePanel.kt @@ -85,8 +85,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() } } diff --git a/src/main/java/net/vektah/codeglance/config/ConfigService.kt b/src/main/java/net/vektah/codeglance/config/ConfigService.kt index 19b5c63..47b42ba 100644 --- a/src/main/java/net/vektah/codeglance/config/ConfigService.kt +++ b/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 { diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 5569348..604a6a4 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,7 +1,7 @@ net.vektah.codeglance CodeGlance - 1.5.4 + 1.5.5 Vektah From b2e22451ffa037c5340e7d3811cb4ddc825e092f Mon Sep 17 00:00:00 2001 From: lixuran Date: Tue, 15 Jun 2021 12:34:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=80=82=E9=85=8Didea=202020.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 9 +++++++- gradle.properties | 2 +- .../java/net/vektah/codeglance/GlancePanel.kt | 21 +++++++++++++------ src/main/resources/META-INF/plugin.xml | 6 +++++- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 431f7d8..61553a4 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,13 @@ plugins { id "org.jetbrains.intellij" version "1.0" } +intellij { + version 'IC-2020.3' +// plugins 'coverage' +// pluginName 'CodeGlance' + updateSinceUntilBuild = false +} + allprojects { apply plugin: 'java' apply plugin: 'kotlin' @@ -23,7 +30,7 @@ allprojects { apply plugin: 'org.jetbrains.intellij' intellij { - version 'IC-2021.1' + version 'IC-2020.3' // plugins 'coverage' // pluginName 'CodeGlance' updateSinceUntilBuild = false diff --git a/gradle.properties b/gradle.properties index 23c4193..9fc34f5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -ideaVersion = IC-2021.1 +ideaVersion = IC-2021.1.0 javaVersion = 1.8 kotlinVersion = 1.4.32 version = 1.5.5 diff --git a/src/main/java/net/vektah/codeglance/GlancePanel.kt b/src/main/java/net/vektah/codeglance/GlancePanel.kt index 35d4b46..7ac96cd 100644 --- a/src/main/java/net/vektah/codeglance/GlancePanel.kt +++ b/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(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 @@ -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]) diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 604a6a4..055b48d 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,6 +1,6 @@ net.vektah.codeglance - CodeGlance + CodeGlance3 1.5.5 Vektah @@ -10,6 +10,10 @@ 1.5.5 +
    +
  • update to 2020.3
    • +

1.5.4

  • Bugfix: Viewport position now calculates correctly for large files -@ru5k
    • From 7b3ed246c3ac48655d74130e4ecc5a314614d95c Mon Sep 17 00:00:00 2001 From: lixuran Date: Tue, 15 Jun 2021 15:10:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1=E3=80=81=E9=80=82=E9=85=8Didea=202020.3?= =?UTF-8?q?=202=E3=80=81=E8=A7=A3=E5=86=B3=E7=BB=84=E4=BB=B6=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 +++- gradle.properties | 4 ++-- .../java/net/vektah/codeglance/config/ConfigEntry.kt | 10 +++++++--- .../java/net/vektah/codeglance/config/ConfigService.kt | 8 ++++---- src/main/resources/META-INF/plugin.xml | 6 +++--- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 61553a4..1b35a87 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } plugins { - id "org.jetbrains.intellij" version "1.0" + id "org.jetbrains.intellij" version "0.6.5" } intellij { @@ -58,3 +58,5 @@ dependencies { wrapper { gradleVersion = '7.0.2' } + + diff --git a/gradle.properties b/gradle.properties index 9fc34f5..15f90af 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -ideaVersion = IC-2021.1.0 +ideaVersion = IC-2020.3 javaVersion = 1.8 kotlinVersion = 1.4.32 -version = 1.5.5 +version = 2.0 diff --git a/src/main/java/net/vektah/codeglance/config/ConfigEntry.kt b/src/main/java/net/vektah/codeglance/config/ConfigEntry.kt index 95806d8..3ea847d 100644 --- a/src/main/java/net/vektah/codeglance/config/ConfigEntry.kt +++ b/src/main/java/net/vektah/codeglance/config/ConfigEntry.kt @@ -25,7 +25,9 @@ package net.vektah.codeglance.config +import com.intellij.openapi.components.ComponentManager import com.intellij.openapi.components.ServiceManager +import com.intellij.openapi.components.ServiceManager.getService import com.intellij.openapi.options.Configurable import com.intellij.openapi.options.ConfigurationException import org.jetbrains.annotations.Nls @@ -35,9 +37,11 @@ import javax.swing.* class ConfigEntry : Configurable { private var form: ConfigForm? = null private val configService = ServiceManager.getService(ConfigService::class.java) + private val config = configService.state!! - @Nls override fun getDisplayName(): String { + @Nls + override fun getDisplayName(): String { return "CodeGlance" } @@ -52,7 +56,7 @@ class ConfigEntry : Configurable { } override fun isModified() = form != null && - (config.pixelsPerLine != form!!.pixelsPerLine + (config.pixelsPerLine != form!!.pixelsPerLine || config.disabled != form!!.isDisabled || config.locked != form!!.isLocked || config.jumpOnMouseDown != form!!.jumpOnMouseDown() @@ -93,7 +97,7 @@ class ConfigEntry : Configurable { form!!.pixelsPerLine = config.pixelsPerLine form!!.isDisabled = config.disabled - form!!.isLocked= config.locked + form!!.isLocked = config.locked form!!.setJumpOnMouseDown(config.jumpOnMouseDown) form!!.setPercentageBasedClick(config.percentageBasedClick) form!!.viewportColor = config.viewportColor diff --git a/src/main/java/net/vektah/codeglance/config/ConfigService.kt b/src/main/java/net/vektah/codeglance/config/ConfigService.kt index 47b42ba..b2c3680 100644 --- a/src/main/java/net/vektah/codeglance/config/ConfigService.kt +++ b/src/main/java/net/vektah/codeglance/config/ConfigService.kt @@ -5,10 +5,10 @@ import com.intellij.util.xmlb.XmlSerializerUtil import java.lang.ref.WeakReference @State( - name = "CodeGlance", - storages = arrayOf( - Storage(value = StoragePathMacros.WORKSPACE_FILE + "/CodeGlance.xml") - ) + name = "CodeGlance3", + storages = [ + Storage( "CodeGlance.xml") + ] ) class ConfigService : PersistentStateComponent { private val observers : MutableList Unit>> = arrayListOf() diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 055b48d..0e7e3ef 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,7 +1,7 @@ net.vektah.codeglance CodeGlance3 - 1.5.5 + 2.0 Vektah @@ -10,7 +10,7 @@ 1.5.5 +

    2.0

    • update to 2020.3
    @@ -132,7 +132,7 @@
]]> - + com.intellij.modules.lang From 872302b81252c5f21ace65874eae912a96b3c59e Mon Sep 17 00:00:00 2001 From: lixuran Date: Tue, 15 Jun 2021 15:24:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1=E3=80=81=E9=80=82=E9=85=8Didea=202020.3?= =?UTF-8?q?=202=E3=80=81=E8=A7=A3=E5=86=B3=E7=BB=84=E4=BB=B6=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index 1b35a87..b53e4bf 100644 --- a/build.gradle +++ b/build.gradle @@ -59,4 +59,7 @@ wrapper { gradleVersion = '7.0.2' } +runIde { + jvmArgs '-DmyProperty=value' +}