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.

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

Deconflict some layer registration positions #7235

Merged
merged 1 commit into from
Apr 8, 2024

Conversation

mbien
Copy link
Member

@mbien mbien commented Apr 3, 2024

  • resolves five org.openide.filesystems.Ordering warnings
  • the older entry is kept, the more recent entry is bumped to a free position

from log:

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
WARNING [org.openide.filesystems.Ordering]: Found same position 1,800 for both Projects/org-netbeans-modules-maven/Actions/org-netbeans-modules-cloud-oracle-adm-RunFileADMAction.shadow and Projects/org-netbeans-modules-maven/Actions/org-netbeans-modules-project-ui-SetMainProject.shadow
WARNING [org.openide.filesystems.Ordering]: Found same position 500 for both OptionsDialog/Editor/InlineHints.instance and OptionsDialog/Editor/MarkOccurrences.instance
WARNING [org.openide.filesystems.Ordering]: Found same position 1,000 for both Editors/text/x-java/CodeGenerators/org-netbeans-modules-jakarta-web-beans-actions-InterceptorFactory.instance and Editors/text/x-java/CodeGenerators/org-netbeans-modules-web-beans-actions-InterceptorFactory.instance
WARNING [org.openide.filesystems.Ordering]: Found same position 876 for both Templates/CDI and Templates/CDI_JakartaEE

@mbien mbien added Java [ci] enable extra Java tests (java.completion, java.source.base, java.hints, refactoring.java, form) enterprise [ci] enable enterprise job labels Apr 3, 2024
@mbien mbien added this to the NB22 milestone Apr 3, 2024
@@ -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.

@mbien
Copy link
Member Author

mbien commented Apr 8, 2024

noticed another warning while testing a different PR:

WARNING [org.openide.filesystems.Ordering]: Found same position 876 for both Templates/CDI and Templates/CDI_JakartaEE

going to update that one too, probably give jakarta higher priority (smaller number) since it is now the preferred version.

 - resolves four org.openide.filesystems.Ordering warnings
 - the older entry is kept, the more recent entry is bumped to a free
   position
@mbien mbien force-pushed the resolve-position-conflicts branch from 9261205 to 3c87d8c Compare April 8, 2024 01:27
@mbien mbien merged commit 57b7d49 into apache:master Apr 8, 2024
39 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enterprise [ci] enable enterprise job Java [ci] enable extra Java tests (java.completion, java.source.base, java.hints, refactoring.java, form)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants