Skip to content

1639: Remove SearchGutterIconNavigationHandler and simplify markers #2485

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
merged 7 commits into from
Feb 15, 2025
Merged

1639: Remove SearchGutterIconNavigationHandler and simplify markers #2485

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1491c0c
1639: Remove SearchGutterIconNavigationHandler and simplify markers
VitaliyBoyko Feb 14, 2025
1ee34ae
Merge branch '5.4.0-develop' into 1639-java.lang.Throwable-Assertion-…
vitaliyboykocontributor Feb 14, 2025
82217b5
Merge remote-tracking branch 'origin/5.4.0-develop' into 1639-java.la…
VitaliyBoyko Feb 14, 2025
6ee3a80
1639: Fix assertion error and improve line marker immutability
VitaliyBoyko Feb 14, 2025
187a523
Merge remote-tracking branch 'contributor/1639-java.lang.Throwable-As…
VitaliyBoyko Feb 14, 2025
67e7c1b
1639: Fix line marker creation targeting `PsiElement` node
VitaliyBoyko Feb 15, 2025
b98e68a
1639: static fix
VitaliyBoyko Feb 15, 2025
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
Prev Previous commit
1639: static fix
  • Loading branch information
@VitaliyBoyko
VitaliyBoyko committed Feb 15, 2025
commit b98e68afce1c8302f6519c297825b799fd7e426d
5 changes: 3 additions & 2 deletions src/main/java/com/magento/idea/magento2plugin/linemarker/php/PluginLineMarkerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,9 @@ public void collectSlowLineMarkers(
}

if (!results.isEmpty()) {
final ASTNode node = psiElement.getNode().findChildByType(PhpTokenTypes.IDENTIFIER);
if(node != null) {
final ASTNode node = psiElement.getNode()
.findChildByType(PhpTokenTypes.IDENTIFIER);
if (node != null) {
// Add the property to a collection of line marker info
final NavigationGutterIconBuilder<PsiElement> builder =
NavigationGutterIconBuilder.create(AllIcons.Nodes.Plugin)
Expand Down
Loading