Skip to content

CE-118 goto parameter #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nofateg merged 1 commit into from
Dec 2, 2025
Merged

CE-118 goto parameter #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

group = "oap"
version = "0.0.5"
version = "0.0.6"

repositories {
mavenCentral()
Expand Down
122 changes: 27 additions & 95 deletions gen/oap/application/plugin/gen/parser/OapParser.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gen/oap/application/plugin/gen/psi/OapModuleServicesServiceLinkField.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions gen/oap/application/plugin/gen/psi/OapParameterKeyValueFirstId.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gen/oap/application/plugin/gen/psi/OapVisitor.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions gen/oap/application/plugin/gen/psi/impl/OapParameterKeyValueFirstIdImpl.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions grammars/oap.bnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,9 @@ module ::=
[]
module_name_pair
( &'enabled' module_enabled )?
( &'include' module_include )*
( &'dependsOn' module_depends_on )?
( &'include' module_include )*
( &'services' module_services )?
( &'include' module_include )*
( &'configurations' module_configurations )? {
pin = 1
recoverWhile=recover_module
Expand Down Expand Up @@ -269,7 +267,9 @@ parameters_array_item ::= &'<' any_reference | &'{' parameters_object | function
java_parameter_key_value ::= parameter_key_value
private java_parameters_object ::= '{' java_parameter_key_value? (','? java_parameter_key_value )* '}' {pin=1}

parameter_key_value_first_id ::= key_name
parameter_key_value_first_id ::= key_name {
methods=[getReference]
}
parameter_key_value ::= parameter_key_value_first_id ('.' key_name)* (&'=' parameter_key_value_key_eq | parameter_key_value_key_object ) {
pin=1
mixin="oap.application.plugin.psi.OapModuleServicesServiceParameterKeyValueMixin"
Expand All @@ -287,7 +287,10 @@ module_services_service_listen ::= 'listen' ( &'.' dot_module_services_service_l
dot_module_services_service_link_field ::= '.' module_services_service_link_field {pin=1}
module_services_service_link_field_object ::= '{' module_services_service_link_field* '}' {pin=1}

module_services_service_link_field ::= key_name '=' reference_modules_value {pin=1}
module_services_service_link_field ::= key_name '=' reference_modules_value {
pin=1
implements="oap.application.plugin.psi.IndentNormal"
}

module_services_service_link ::= 'link' ( &'.' dot_module_services_service_link_field | module_services_service_link_field_object ) {
pin=1
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/oap/application/plugin/editor/JavaOapServiceLineMarkerProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class JavaOapServiceLineMarkerProvider : LineMarkerProvider {
.setTargets(services)
.setTooltipText("Service implementation")
.setAlignment(GutterIconRenderer.Alignment.RIGHT)
.createLineMarkerInfo(element)
.createLineMarkerInfo(element.nameIdentifier!!)
}
}

Expand Down
17 changes: 17 additions & 0 deletions ...main/kotlin/oap/application/plugin/manipulators/OapParameterKeyValueFirstIdManipulator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package oap.application.plugin.manipulators

import com.intellij.openapi.util.TextRange
import com.intellij.psi.AbstractElementManipulator
import oap.application.plugin.gen.psi.OapParameterKeyValueFirstId
import oap.application.plugin.psi.IModuleName
import oap.application.plugin.psi.OapPsiElementFactory

class OapParameterKeyValueFirstIdManipulator : AbstractElementManipulator<OapParameterKeyValueFirstId>() {
override fun handleContentChange(
element: OapParameterKeyValueFirstId,
range: TextRange,
newContent: String
): OapParameterKeyValueFirstId? {
return OapPsiElementFactory.replaceText(element, newContent);
}
}
Loading