Reenable download of optional nonbundled dependencies #1294
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
novotnyr
force-pushed
the
optional-dependency-resolution
branch
2 times, most recently
from
6e4248e to
31c9f5e
Compare
… performance improvement
novotnyr
force-pushed
the
optional-dependency-resolution
branch
from
31c9f5e to
5e663b0
Compare
Structure library extracts the ZIP. This process is repeated in Plugin Verification. Reuse the intermediate extracted directory
There was a problem hiding this comment.
Pull Request Overview
Re-enable download of optional non-bundled dependencies, add ZIP plugin resource caching, and extend plugin/provider APIs for module-based lookup.
- Bridge between IntelliJ Structure’s
PluginProviderand Plugin Verifier’sDependencyFinderfor dependency downloads. - Introduce
PluginResourceCacheto cache and reuse extracted ZIP plugin directories. - Extend
PluginProvider/PluginQuerywith module-ID search,findPluginByIdOrModuleId,containsPlugin, and addCompositePluginProvider.
Reviewed Changes
Copilot reviewed 68 out of 68 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| EmptyPluginResourceCache.kt | No-op implementation of PluginResourceCache. |
| PluginQuery.java | Add searchContentModuleId flag, builder method, and update toString(). |
| PluginProvision.kt | Add CONTENT_MODULE_ID source and override toString() for better messaging. |
| PluginProviderResult.java | Introduce result wrapper with resolution Type enum (PLUGIN/MODULE). |
| PluginProvider.java | Add findPluginByIdOrModuleId, containsPlugin, and getPresentableName. |
| PluginCreator.kt | Track and propagate ZipPluginResource instances and delete them on failure. |
| InlineDeclaredModuleV2Dependency.kt | Correct isModule flags and refine toString() wording. |
| IdePluginManager.kt | Refactor ZIP extraction flow with deleteExtractedDirectory flag and resource cleanup. |
| CompositePluginProvider.kt | Implement multi-source lookup for both plugin ID and module ID. |
| IdePluginClassesFinder.kt | Integrate PluginResourceCache to reuse extracted plugin directories. |
| ClassSearchContext.kt | Encapsulate cache and extract directory in a search context. |
| BundledPluginClassesFinder.kt | Pass ClassSearchContext to IdePluginClassesFinder. |
| PluginQueryMatcher.kt | Match searchContentModuleId in IDE-side query logic. |
| Ide.java | Delegate module-ID lookup via PluginProviderResult and add helper methods. |
| CachingPluginDependencyResolverProvider.kt | Parameterize IDE module predicate/dependencies modifier and simplify resolver creation. |
| DelegatingResolver.kt | Add DelegatingNamedResolver for lazy delegate initialization. |
| Jar.kt | Catch NoSuchElementException to throw clearer JarArchiveException. |
| Deletable.kt | Add Deletable interface for resource cleanup. |
| BasePluginProblem.kt | Fix minor grammar in Javadoc. |
| PluginCreationResult.kt | Extend success result with closeable resources list. |
Comments suppressed due to low confidence (2)
intellij-plugin-structure/structure-intellij/src/main/java/com/jetbrains/plugin/structure/intellij/plugin/CompositePluginProvider.kt:35
- The implementation of findPluginByIdOrModuleId does not return the result of the let expression. Each call creates a PluginProviderResult but it’s never returned. Add
returnbefore the provider lookup so found results are actually returned.
provider.findPluginById(pluginIdOrModuleId)?.let { PluginProviderResult(PLUGIN, it) }
intellij-plugin-structure/structure-intellij/src/main/java/com/jetbrains/plugin/structure/intellij/plugin/IdePluginManager.kt:159
- The variable
pluginis not defined in this scope. You likely intended to pass theIdePlugininstance managed by the PluginCreator. Update this reference to use the correct variable (for example,this.pluginor a properly named variable from the surrounding context).
resources += ZipPluginResource.of(pluginFile, extractedDir, plugin)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Dependency Download
DefaultClassResolverProvideris able to download missing plugin dependencies even when theDependencyTreeis used.DependencyFinderPluginProvideras a bridge betweenPluginProviderfrom the IntelliJ Structure library andDependencyFinderfrom the Plugin Verifier library. This allows to download dependencies via JetBrains Marketplace or local caches.DefaultPluginDetailsProviderhas a flag whether to provide missing dependencies from other sources.ZIP-based Plugin handling
OptionalDependencyResolvercan extract ZIP plugins and retain their extracted directories as a file-system cache for further processing of classpaths.Let
PluginCreatormaintain additional resources that can be closed. This is used for extracted ZIP archives.Let
PluginCreationResultcarry additional resources that can be closed. This is used for extracted ZIP archives.DefaultPluginDetailsProvideris now stateful as it collects extracted directories of ZIP plugins that were downloaded from JetBrains Marketplace.Make
DefaultPluginDetailsProviderstateful. For ZIP plugins, reuse their extracted directories as a plugin construction sources.Introduce
PluginResourceCachethat is able to maintain a list of extracted directories corresponding to ZIP archives. IntelliJ Structure and IntelliJ Plugin Verifier will share this cache in order toclasspathpoint to real files in the filesystemThis cache is used in all places when plugin is scanned for classes.
Plugin and Module resolution
CachingPluginDependencyResolverProvideris updated with an ability to decide if a plugin is an IDE moduleCachingPluginDependencyResolverProvideris updated with an ability to augment list of dependencies. This is used to contribute Java module for legacy plugins.Ideis able to provide plugin or module by ID and indicate the source of this provision.CompositePluginProviderfor searching in multiple providers.PluginProvidernow provides a method to find plugin by ID or module ID. Since the semantics can be complex, an exact source of the plugin is provided.PluginProvidernow provides a method to indicate if a plugin with a specified ID is present.BundledPluginDependencyFinderto consult an IDE instance for bundled plugins.Optimizations
DependencyTreemechanism has been optimized to prevent unnecessary resolution of plugins or modules.DependencyTreeis able to distinguish between plugins or modules by an external predicate.LegacyPluginDependencyContributorto consult an IDE instance for Java module.