Skip to content

Commit

Permalink
Merge pull request #3368 from Hannah-Sten/add-label-intention
Browse files Browse the repository at this point in the history
Improve logging for add label intention
  • Loading branch information
PHPirates authored Dec 30, 2023
2 parents 12bbb26 + f9ab5de commit e093c0c
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 16 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
## [Unreleased]

### Added
* Improve plugin loading performance

### Fixed
* Fix #3361: false positive on duplicate identifier on @string entries in bib files

## [0.9.2] - 2023-11-24

Expand Down
28 changes: 14 additions & 14 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ plugins {
id("org.jlleitschuh.gradle.ktlint") version "11.3.2"

// Vulnerability scanning
id("org.owasp.dependencycheck") version "9.0.2"
id("org.owasp.dependencycheck") version "9.0.7"

id("org.jetbrains.changelog") version "2.2.0"

id("org.jetbrains.grammarkit") version "2022.3.2"
id("org.jetbrains.grammarkit") version "2022.3.2.1"
}

group = "nl.hannahsten"
Expand Down Expand Up @@ -84,29 +84,29 @@ dependencies {

// D-Bus Java bindings
implementation("com.github.hypfvieh:dbus-java:3.3.2")
implementation("org.slf4j:slf4j-simple:2.0.9")
implementation("org.slf4j:slf4j-simple:2.0.10")

// Unzipping tar.xz/tar.bz2 files on Windows containing dtx files
implementation("org.codehaus.plexus:plexus-component-api:1.0-alpha-33")
implementation("org.codehaus.plexus:plexus-container-default:2.1.1")
implementation("org.codehaus.plexus:plexus-archiver:4.9.0")
implementation("org.codehaus.plexus:plexus-archiver:4.9.1")

// Parsing json
implementation("com.beust:klaxon:5.6")

// Parsing xml
implementation("com.fasterxml.jackson.core:jackson-core:2.16.0")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.16.0")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.16.0")
implementation("com.fasterxml.jackson.core:jackson-core:2.16.1")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.16.1")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.16.1")

// Http requests
implementation("io.ktor:ktor-client-core:2.3.6")
implementation("io.ktor:ktor-client-cio:2.3.6")
implementation("io.ktor:ktor-client-auth:2.3.6")
implementation("io.ktor:ktor-client-content-negotiation:2.3.6")
implementation("io.ktor:ktor-server-core:2.3.6")
implementation("io.ktor:ktor-server-jetty:2.3.6")
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.6")
implementation("io.ktor:ktor-client-core:2.3.7")
implementation("io.ktor:ktor-client-cio:2.3.7")
implementation("io.ktor:ktor-client-auth:2.3.7")
implementation("io.ktor:ktor-client-content-negotiation:2.3.7")
implementation("io.ktor:ktor-server-core:2.3.7")
implementation("io.ktor:ktor-server-jetty:2.3.7")
implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.7")

// Comparing versions
implementation("org.apache.maven:maven-artifact:4.0.0-alpha-7")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pluginVersion = 0.9.3-alpha.1
pluginVersion = 0.9.3-alpha.2

# Info about build ranges: https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html
# Note that an xyz branch corresponds to version 20xy.z and a since build of xyz.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ abstract class LatexAddLabelIntention(name: String) : TexifyIntentionBase(name)
// setOptionalParameter should create an appropriate optionalArgument node with label={text} in it
val parameterText =
parameter?.keyValValue?.keyValContentList?.firstOrNull()?.parameterGroup?.parameterGroupText?.parameterTextList?.firstOrNull()
?: throw AssertionError("parameter created by setOptionalParameter does not have the right structure")
?: throw AssertionError("parameter created by setOptionalParameter for $command with text ${label.labelText} does not have the right structure: ${parameter?.text}")
// Move the caret onto the label
editor.caretModel.moveToOffset(parameterText.textOffset + label.prefix.length + 1)
val renamer = LabelInplaceRenamer(parameterText, editor, label.prefixText, label.base, moveCaretTo)
Expand Down

0 comments on commit e093c0c

Please sign in to comment.