Skip to content
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

Jump to bottom

Deconflict some layer registration positions #7235

Merged
merged 1 commit into from
Apr 8, 2024
Merged

Deconflict some layer registration positions #7235

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 enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/RunFileADMAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

@ActionReferences(value = {
@ActionReference(position = 251, path = "Loaders/text/x-maven-pom+xml/Actions"),
@ActionReference(position = 1800, path = "Projects/org-netbeans-modules-maven/Actions")
@ActionReference(position = 1850, path = "Projects/org-netbeans-modules-maven/Actions")
})

@NbBundle.Messages({
Expand Down
4 changes: 2 additions & 2 deletions enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/resources/layer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<folder name="x-java">
<folder name="CodeGenerators">
<file name="org-netbeans-modules-jakarta-web-beans-actions-InterceptorFactory.instance">
<attr name="position" intvalue="1000"/>
<attr name="position" intvalue="1100"/>
</file>
</folder>
<folder name="GlyphGutterActions">
Expand Down Expand Up @@ -92,7 +92,7 @@
<folder name="Templates">
<folder name="CDI_JakartaEE">
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.jakarta.web.beans.resources.Bundle"/>
<attr name="position" intvalue="876"/>
<attr name="position" intvalue="874"/>
<file name="beans.xml">
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.jakarta.web.beans.resources.Bundle"/>
<attr name="position" intvalue="10"/>
Expand Down
2 changes: 1 addition & 1 deletion ide/options.editor/src/org/netbeans/modules/options/editor/FolderBasedController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public static OptionsPanelController markOccurrences() {
location=OptionsDisplayer.EDITOR,
keywords="#KW_InlineHints",
keywordsCategory="Editor/InlineHints",
position=500
position=600
// toolTip="#CTL_MarkOccurences_ToolTip"
)
public static OptionsPanelController inlineHints() {
Expand Down
2 changes: 1 addition & 1 deletion ....launcher/src/org/netbeans/modules/java/file/launcher/indexer/CompilerOptionsIndexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ protected void index(Iterable<? extends Indexable> files, Context context) {
}


@MimeRegistration(mimeType="text/x-java", service=CustomIndexerFactory.class, position=1_000)
@MimeRegistration(mimeType="text/x-java", service=CustomIndexerFactory.class, position=1_100)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see this error for the CompilerOptionsIndexer:

WARNING [org.openide.filesystems.Ordering]: Not all children in / marked with the position attribute: [org-netbeans-modules-refactoring-java-plugins-InstantRefactoringPerformer$UndoableWrapper.instance, org-netbeans-modules-testng-ui-actions-TestClassInfoTask$TestNGComputeTestMethodsImpl.instance, org-netbeans-modules-java-hints-spiimpl-hints-HintsTask$SuggestionsPositionRefresherHelper.instance, org-netbeans-modules-java-hints-spiimpl-options-HintsSettings$GlobalSettingsProvider.instance, org-netbeans-modules-editor-java-JavaKit$JavaTypedTextInterceptor$Factory.instance, org-netbeans-modules-micronaut-MicronautExpressionLanguageTokenId$Factory.instance, org-netbeans-modules-java-hints-declarative-debugging-EvaluationSpanTask$FactoryImpl.instance, org-netbeans-modules-refactoring-java-ui-HighlightsLayerFactory.instance, org-netbeans-modules-java-editor-codegen-RemoveSurroundingCodePanel$UnwrapCodeHighlightsLayerFactory.instance, EditorKit.instance, org-netbeans-modules-java-navigation-BreadCrumbsScanningTask$Factory.instance, org-netbeans-modules-java-hints-infrastructure-JavaErrorProvider.instance, org-netbeans-modules-java-hints-infrastructure-ErrorHintsFactory.instance, org-netbeans-modules-junit-ui-actions-TestClassInfoTask$JUnitComputeTestMethodsImpl.instance, org-netbeans-modules-java-editor-semantic-SemanticHighlighterFactory.instance, org-netbeans-modules-java-hints-infrastructure-EmbeddedLazyHintComputation$FactoryImpl.instance, Reformatter.instance, org-netbeans-modules-java-source-indexing-JavaCustomIndexer$Factory-register.instance, org-netbeans-modules-java-hints-infrastructure-ErrorPositionRefresherHelper.instance, org-netbeans-modules-java-hints-introduce-IntroduceHint$HLFImpl.instance, org-netbeans-modules-editor-htmlui-JSEmbeddingProvider$Factory.instance, org-netbeans-modules-editor-java-CamelCaseOperations$JavaCamelCaseInterceptor$JavaFactory.instance, org-netbeans-modules-java-editor-whitelist-WhiteListCheckTask$Factory.instance, org-netbeans-modules-gsf-codecoverage-CoverageHighlightsLayerFactory.instance, SourcePathCheck.instance, org-netbeans-modules-editor-java-JavaKit$JavaDeletedTextInterceptor$Factory.instance, org-netbeans-modules-javadoc-highlighting-Factory.instance, org-netbeans-modules-java-editor-fold-ResourceStringFoldProvider.instance, AutoIndenter.instance, org-netbeans-modules-java-guards-JavaGuardedSections.instance, org-netbeans-modules-whitelist-index-WhiteListIndexerPlugin$Factory.instance, org-netbeans-modules-java-debug-HighlightsLayerFactoryImpl.instance, CopyResourcesIndexer.instance, org-netbeans-modules-refactoring-java-plugins-InstantRefactoringPerformer$RenameDeletedTextInterceptor$Factory.instance, org-netbeans-modules-java-source-parsing-JavacParserFactory.instance, org-netbeans-modules-java-editor-semantic-HighlightsLayerFactoryImpl.instance, org-netbeans-modules-java-editor-rename-InstantRenamePerformer$RenameDeletedTextInterceptor$Factory.instance, org-netbeans-modules-java-editor-overridden-ComputeAnnotations$FactoryImpl.instance, org.netbeans.spi.editor.highlighting.HighlightsLayerFactory.instance, Reindenter.instance, org-netbeans-modules-java-editor-semantic-MarkOccurrencesHighlighterFactory.instance, org-netbeans-modules-debugger-jpda-projectsui-HighlightsLayerFactoryImpl.instance, org-netbeans-modules-micronaut-symbol-MicronautSymbolErrorProvider.instance, org-netbeans-modules-java-source-parsing-VanillaPartialReparser$VerifyPartialReparse$FactoryImpl.instance, org-netbeans-modules-java-hints-spiimpl-hints-HintsTask$HintPositionRefresherHelper.instance, org-netbeans-modules-refactoring-java-callhierarchy-LspCallHierarchyProvider.instance, org-netbeans-modules-micronaut-symbol-MicronautSymbolFinder$Factory.instance, language.instance, org-netbeans-modules-editor-java-JavaKit$JavaTypedBreakInterceptor$JavaFactory.instance, org-netbeans-modules-java-hints-introduce-PositionRefresherHelperImpl.instance, org-netbeans-modules-profiler-nbimpl-providers-JavaProfilerSourceImpl.instance, org-netbeans-modules-java-hints-spiimpl-JavaHintsPositionRefresher.instance, org-netbeans-modules-lsp-client-bindings-SemanticHighlight$HighlightsLayerFactoryImpl.instance, org-netbeans-modules-editor-fold-ui-FoldingEditorSupport$F.instance, org-netbeans-modules-java-source-indexing-JavaBinaryIndexer$Factory-register.instance, org-netbeans-lib-editor-codetemplates-textsync-TextRegionManager$Highlighting$HLFactory.instance, org-netbeans-modules-lsp-client-bindings-MarkOccurrences$HighlightsLayerFactoryImpl.instance, org-netbeans-modules-lsp-client-bindings-CustomIndexerImpl$FactoryImpl.instance, org-netbeans-modules-merge-builtin-visualizer-MergeHighlightsLayerFactory.instance, org-netbeans-modules-csl-hints-infrastructure-SelectionHintsTaskFactory.instance, org-netbeans-modules-editor-hints-lsp-HintsDiagnosticsProvider.instance, org-netbeans-modules-java-hints-infrastructure-EmbeddedHintsCollector$Factory.instance, org-netbeans-modules-csl-core-CslCamelCaseInterceptor$Factory.instance, org-netbeans-modules-csl-editor-overridden-ComputeAnnotations$FactoryImpl.instance, org-netbeans-modules-spellchecker-SpellcheckerHighlightLayerFactory.instance, org-netbeans-modules-editor-impl-DocumentFactoryImpl.instance, org-netbeans-modules-diff-builtin-visualizer-editable-DiffHighlightsLayerFactory.instance, org-netbeans-modules-csl-editor-fold-GsfFoldManagerTaskFactory.instance, org-netbeans-modules-textmate-lexer-SyntaxHighlighting$FactoryImpl.instance, org-netbeans-modules-editor-impl-highlighting-HLFactory.instance, org-netbeans-modules-editor-hints-HighlightsLayerFactoryImpl.instance, org-netbeans-modules-editor-bracesmatching-BracesMatchHighlighting$Factory.instance, org-netbeans-lib-editor-hyperlink-HyperlinkOperation$HighlightFactoryImpl.instance, org-netbeans-modules-javascript2-editor-embedding-JsEmbeddingProvider$Factory.instance, org-netbeans-modules-csl-editor-semantic-MarkOccurrencesHighlighterFactory.instance, org-netbeans-modules-editor-lib2-highlighting-Factory.instance, org-netbeans-modules-editor-search-TextSearchHighlighting$FactoryImpl.instance, org-netbeans-modules-csl-hints-infrastructure-HintsTaskFactory.instance, org-netbeans-modules-refactoring-spi-impl-UndoableWrapper.instance, COSSynchronizingIndexer.instance, org-netbeans-modules-java-lsp-server-protocol-Server$LSPServerTelemetryFactory-getDefault.instance, org-netbeans-modules-gsf-testrunner-ui-TestMethodFinderImpl$Factory.instance, org-netbeans-modules-csl-hints-GsfHintsFactory.instance, org-netbeans-modules-csl-navigation-BreadCrumbsTask$TaskFactoryImpl.instance, org-netbeans-modules-editor-url-HighlightURLs$FactoryImpl.instance, org-netbeans-modules-web-jsf-editor-index-JsfBinaryIndexer.instance, org-netbeans-modules-web-jsf-editor-index-JsfCustomIndexer$Factory.instance, org-netbeans-modules-tasklist-impl-TaskIndexerFactory.instance, org-netbeans-modules-csl-hints-infrastructure-SuggestionsTaskFactory.instance, org-netbeans-modules-jumpto-file-FileIndexer$Factory.instance, org-netbeans-modules-csl-navigation-CaretListeningFactory.instance, org-netbeans-modules-csl-navigation-ClassMemberNavigatorSourceFactory.instance, org-netbeans-modules-csl-editor-semantic-SemanticHighlighterFactory.instance, org-netbeans-modules-spring-beans-index-SpringBinaryIndexer.instance], but some are: [org-netbeans-modules-editor-java-JavaStructureProvider.instance, org-netbeans-modules-java-file-launcher-indexer-CompilerOptionsIndexer$FactoryImpl.instance, org-netbeans-modules-micronaut-symbol-MicronautStructureProvider.instance]

This looks like a different problem - we have no duplicates, but a mixed case.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks like a warning which would also happen without this change, just that the list on the end of the log line would have one item less:

but some are: [org-netbeans-modules-editor-java-JavaStructureProvider.instance, org-netbeans-modules-java-file-launcher-indexer-CompilerOptionsIndexer$FactoryImpl.instance, org-netbeans-modules-micronaut-symbol-MicronautStructureProvider.instance]

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not see the conflict, but anyway, I also see no problem in the change.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you mean you can't reproduce this warning?

WARNING [org.openide.filesystems.Ordering]: Found same position 1,000 for both org-netbeans-modules-micronaut-symbol-MicronautStructureProvider.instance and org-netbeans-modules-java-file-launcher-indexer-CompilerOptionsIndexer$FactoryImpl.instance

I have to check tomorrow, but I think one of them was triggered via right click on a file or something like that - I forgot.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now I see it, sorry for the noise.

public static final class FactoryImpl extends CustomIndexerFactory {

@Override
Expand Down
Loading