MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-216355 remove deprecated package attribute to pack into separate jars (Community Plugins - Other)

Browse Source 
GitOrigin-RevId: 005fe52450ad8413eed36017340f8edb6fb1904b
This commit is contained in:
Vladimir Krivosheev
2025-11-09 19:25:28 +00:00
committed by intellij-monorepo-bot
parent 96dac8bcc6
commit fbbda77200
49 changed files with 231 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/src/org/jetbrains/intellij/build/autoLayout.kt
+9 -9
View File
@@ -36,7 +36,7 @@ internal suspend fun inferModuleSources(
}
val moduleItem = ModuleItem(moduleName = name, relativeOutputFile = getDefaultJarName(layout, name, frontendModuleFilter), reason = "<- ${layout.mainModule}")
if (isIncludedIntoAnotherPlugin(platformLayout = platformLayout, moduleItem = moduleItem, context = context, layout = layout, moduleName = name)) {
if (isIncludedIntoAnotherPlugin(platformLayout = platformLayout, moduleItem = moduleItem, layout = layout, moduleName = name, context = context)) {
continue
}
@@ -145,13 +145,13 @@ private fun getDefaultJarName(layout: PluginLayout, moduleName: String, frontend
}
}
private fun isIncludedIntoAnotherPlugin(platformLayout: PlatformLayout, moduleItem: ModuleItem, context: BuildContext, layout: PluginLayout, moduleName: String): Boolean {
if (moduleName == VERIFIER_MODULE) {
return false
private fun isIncludedIntoAnotherPlugin(platformLayout: PlatformLayout, moduleItem: ModuleItem, layout: PluginLayout, moduleName: String, context: BuildContext): Boolean {
return when {
moduleName == VERIFIER_MODULE -> false
platformLayout.includedModules.contains(moduleItem) -> true
platformLayout.includedModules.any { it.moduleName == moduleName } -> true
else -> context.productProperties.productLayout.pluginLayouts.any { otherPluginLayout ->
otherPluginLayout !== layout && otherPluginLayout.includedModules.any { it.moduleName == moduleName }
}
}
return platformLayout.includedModules.contains(moduleItem) ||
context.productProperties.productLayout.pluginLayouts.any { otherPluginLayout ->
otherPluginLayout !== layout && otherPluginLayout.includedModules.any { it.moduleName == moduleName }
}
}
platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt
+2 -9
View File
@@ -373,7 +373,7 @@ class JarPackager private constructor(
result
}
moduleOutputRoots.forEach { moduleOutDir ->
for (moduleOutDir in moduleOutputRoots) {
val source = createModuleSource(module, moduleOutDir, excludes)
if (source != null) {
moduleSources.add(source)
@@ -385,14 +385,7 @@ class JarPackager private constructor(
}
if (layout != null && (layout !is PluginLayout || !layout.modulesWithExcludedModuleLibraries.contains(moduleName))) {
computeSourcesForModuleLibs(
item = item,
layout = layout,
module = module,
copiedFiles = copiedFiles,
asset = jarAsset,
withTests = useTestModuleOutput,
)
computeSourcesForModuleLibs(item = item, layout = layout, module = module, copiedFiles = copiedFiles, asset = jarAsset, withTests = useTestModuleOutput)
}
}
platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
+2 -2
View File
@@ -435,14 +435,14 @@ internal fun computeProjectLibsUsedByPlugins(enabledPluginModules: Set<String>,
return result
}
suspend fun getEnabledPluginModules(pluginsToPublish: Set<PluginLayout>, context: BuildContext): Set<String> {
fun getEnabledPluginModules(pluginsToPublish: Set<PluginLayout>, context: BuildContext): Set<String> {
val result = LinkedHashSet<String>()
result.addAll(context.getBundledPluginModules())
pluginsToPublish.mapTo(result) { it.mainModule }
return result
}
private suspend fun toModuleItemSequence(list: Collection<String>, productLayout: ProductModulesLayout, reason: String, context: BuildContext): Sequence<ModuleItem> {
private fun toModuleItemSequence(list: Collection<String>, productLayout: ProductModulesLayout, reason: String, context: BuildContext): Sequence<ModuleItem> {
val frontendModuleFilter = context.getFrontendModuleFilter()
return list.asSequence()
.filter { !productLayout.excludedModuleNames.contains(it) }
plugins/compose/intellij.compose.ide.plugin.shared/resources/intellij.compose.ide.plugin.shared.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin package="com.intellij.compose.ide.plugin.shared">
<idea-plugin>
<extensions defaultExtensionNs="com.intellij">
<additionalTextAttributes scheme="Default" file="colorSchemes/IntelliJComposeColorSchemeDefault.xml"/>
<additionalTextAttributes scheme="Darcula" file="colorSchemes/IntelliJComposeColorSchemeDarcula.xml"/>
plugins/compose/plugin-content.yaml
+4 -2
View File
@@ -2,10 +2,12 @@
modules:
- name: intellij.compose.ide.plugin
contentModules:
- name: intellij.compose.ide.plugin.shared
- name: intellij.compose.ide.plugin.k1
- name: intellij.compose.ide.plugin.k2
- name: intellij.compose.ide.plugin.resources
- name: lib/modules/intellij.compose.ide.plugin.gradleTooling.rt.jar
contentModules:
- name: intellij.compose.ide.plugin.gradleTooling.rt
- name: intellij.compose.ide.plugin.gradleTooling.rt
- name: lib/modules/intellij.compose.ide.plugin.shared.jar
contentModules:
- name: intellij.compose.ide.plugin.shared
plugins/devkit/devkit-core/gen/com/intellij/devkit/core/icons/DevkitCoreIcons.java
+40
View File
@@ -0,0 +1,40 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.devkit.core.icons;
import com.intellij.ui.IconManager;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
/**
* NOTE THIS FILE IS AUTO-GENERATED
* DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
*/
public final class DevkitCoreIcons {
private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) {
return IconManager.getInstance().loadRasterizedIcon(path, DevkitCoreIcons.class.getClassLoader(), cacheKey, flags);
}
private static @NotNull Icon load(@NotNull String expUIPath, @NotNull String path, int cacheKey, int flags) {
return IconManager.getInstance().loadRasterizedIcon(path, expUIPath, DevkitCoreIcons.class.getClassLoader(), cacheKey, flags);
}
/** 16x16 */ public static final @NotNull Icon Add_sdk = load("icons/expui/addSDK.svg", "icons/add_sdk.svg", 641117830, 2);
/** 16x16 */ public static final @NotNull Icon ComposeToolWindow = load("icons/expui/composeToolWindow.svg", 542147654, 2);
public static final class Gutter {
/** 12x12 */ public static final @NotNull Icon DescriptionFile = load("icons/expui/gutter/descriptionFile@14x14.svg", "icons/gutter/descriptionFile.svg", 1318760137, 2);
/** 12x12 */ public static final @NotNull Icon Diff = load("icons/expui/gutter/diff@14x14.svg", "icons/gutter/diff.svg", 124039984, 2);
/** 12x12 */ public static final @NotNull Icon Plugin = load("icons/expui/gutter/plugin@14x14.svg", "icons/gutter/plugin.svg", 1850322899, 2);
/** 12x12 */ public static final @NotNull Icon Properties = load("icons/expui/gutter/properties@14x14.svg", "icons/gutter/properties.svg", -818710709, 2);
}
/** 16x16 */ public static final @NotNull Icon Items = load("icons/expui/items.svg", -1922827174, 2);
/** 16x16 */ public static final @NotNull Icon LegacyPluginModule = load("icons/expui/legacyPluginModule.svg", 1708808352, 2);
/** 16x16 */ public static final @NotNull Icon PluginModule = load("icons/expui/pluginModule.svg", 1662209782, 2);
/** 16x16 */ public static final @NotNull Icon PluginV2 = load("icons/expui/pluginV2.svg", -654258637, 2);
/** 16x16 */ public static final @NotNull Icon ProjectService = load("icons/expui/projectService.svg", -1874664689, 2);
/** 16x16 */ public static final @NotNull Icon ProjectState = load("icons/expui/projectState.svg", 329241222, 2);
/** 16x16 */ public static final @NotNull Icon RemoteMapping = load("icons/expui/remoteMapping.svg", "icons/remoteMapping.svg", 1371307852, 2);
/** 16x16 */ public static final @NotNull Icon Sdk_closed = load("icons/expui/sdkClosed.svg", "icons/sdk_closed.svg", -1355048140, 2);
/** 16x16 */ public static final @NotNull Icon Service = load("icons/expui/service.svg", 865613742, 2);
/** 16x16 */ public static final @NotNull Icon State = load("icons/expui/state.svg", 889951373, 2);
}
plugins/devkit/devkit-core/gen/org/jetbrains/idea/devkit/DevKitIcons.java
+73 -24
View File
@@ -1,40 +1,89 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit;
import com.intellij.ui.IconManager;
import com.intellij.devkit.core.icons.DevkitCoreIcons;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
/**
* NOTE THIS FILE IS AUTO-GENERATED
* DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
* @deprecated Use {@link DevkitCoreIcons} instead.
*/
@Deprecated(forRemoval = true)
public final class DevKitIcons {
private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) {
return IconManager.getInstance().loadRasterizedIcon(path, DevKitIcons.class.getClassLoader(), cacheKey, flags);
private DevKitIcons() {
}
private static @NotNull Icon load(@NotNull String expUIPath, @NotNull String path, int cacheKey, int flags) {
return IconManager.getInstance().loadRasterizedIcon(path, expUIPath, DevKitIcons.class.getClassLoader(), cacheKey, flags);
}
/** 16x16 */ public static final @NotNull Icon Add_sdk = load("icons/expui/addSDK.svg", "icons/add_sdk.svg", 641117830, 2);
/** 16x16 */ public static final @NotNull Icon ComposeToolWindow = load("icons/expui/composeToolWindow.svg", 542147654, 2);
/** @deprecated Use {@link DevkitCoreIcons#Add_sdk} */
@Deprecated(forRemoval = true)
public static final @NotNull Icon Add_sdk = DevkitCoreIcons.Add_sdk;
/** @deprecated Use {@link DevkitCoreIcons#ComposeToolWindow} */
@Deprecated(forRemoval = true)
public static final @NotNull Icon ComposeToolWindow = DevkitCoreIcons.ComposeToolWindow;
/**
* @deprecated Use {@link DevkitCoreIcons.Gutter} instead.
*/
@Deprecated(forRemoval = true)
public static final class Gutter {
/** 12x12 */ public static final @NotNull Icon DescriptionFile = load("icons/expui/gutter/descriptionFile@14x14.svg", "icons/gutter/descriptionFile.svg", 1318760137, 2);
/** 12x12 */ public static final @NotNull Icon Diff = load("icons/expui/gutter/diff@14x14.svg", "icons/gutter/diff.svg", 124039984, 2);
/** 12x12 */ public static final @NotNull Icon Plugin = load("icons/expui/gutter/plugin@14x14.svg", "icons/gutter/plugin.svg", 1850322899, 2);
/** 12x12 */ public static final @NotNull Icon Properties = load("icons/expui/gutter/properties@14x14.svg", "icons/gutter/properties.svg", -818710709, 2);
private Gutter() {
}
/** @deprecated Use {@link DevkitCoreIcons.Gutter#DescriptionFile} */
@Deprecated(forRemoval = true)
public static final @NotNull Icon DescriptionFile = DevkitCoreIcons.Gutter.DescriptionFile;
/** @deprecated Use {@link DevkitCoreIcons.Gutter#Diff} */
@Deprecated(forRemoval = true)
public static final @NotNull Icon Diff = DevkitCoreIcons.Gutter.Diff;
/** @deprecated Use {@link DevkitCoreIcons.Gutter#Plugin} */
@Deprecated(forRemoval = true)
public static final @NotNull Icon Plugin = DevkitCoreIcons.Gutter.Plugin;
/** @deprecated Use {@link DevkitCoreIcons.Gutter#Properties} */
@Deprecated(forRemoval = true)
public static final @NotNull Icon Properties = DevkitCoreIcons.Gutter.Properties;
}
/** 16x16 */ public static final @NotNull Icon Items = load("icons/expui/items.svg", -1922827174, 2);
/** 16x16 */ public static final @NotNull Icon LegacyPluginModule = load("icons/expui/legacyPluginModule.svg", 1708808352, 2);
/** 16x16 */ public static final @NotNull Icon PluginModule = load("icons/expui/pluginModule.svg", 1662209782, 2);
/** 16x16 */ public static final @NotNull Icon PluginV2 = load("icons/expui/pluginV2.svg", -654258637, 2);
/** 16x16 */ public static final @NotNull Icon ProjectService = load("icons/expui/projectService.svg", -1874664689, 2);
/** 16x16 */ public static final @NotNull Icon ProjectState = load("icons/expui/projectState.svg", 329241222, 2);
/** 16x16 */ public static final @NotNull Icon RemoteMapping = load("icons/expui/remoteMapping.svg", "icons/remoteMapping.svg", 1371307852, 2);
/** 16x16 */ public static final @NotNull Icon Sdk_closed = load("icons/expui/sdkClosed.svg", "icons/sdk_closed.svg", -1355048140, 2);
/** 16x16 */ public static final @NotNull Icon Service = load("icons/expui/service.svg", 865613742, 2);
/** 16x16 */ public static final @NotNull Icon State = load("icons/expui/state.svg", 889951373, 2);
/** @deprecated Use {@link DevkitCoreIcons#Items} */
@Deprecated(forRemoval = true)
public static final @NotNull Icon Items = DevkitCoreIcons.Items;
/** @deprecated Use {@link DevkitCoreIcons#LegacyPluginModule} */
@Deprecated(forRemoval = true)
public static final @NotNull Icon LegacyPluginModule = DevkitCoreIcons.LegacyPluginModule;
/** @deprecated Use {@link DevkitCoreIcons#PluginModule} */
@Deprecated(forRemoval = true)
public static final @NotNull Icon PluginModule = DevkitCoreIcons.PluginModule;
/** @deprecated Use {@link DevkitCoreIcons#PluginV2} */
@Deprecated(forRemoval = true)
public static final @NotNull Icon PluginV2 = DevkitCoreIcons.PluginV2;
/** @deprecated Use {@link DevkitCoreIcons#ProjectService} */
@Deprecated(forRemoval = true)
public static final @NotNull Icon ProjectService = DevkitCoreIcons.ProjectService;
/** @deprecated Use {@link DevkitCoreIcons#ProjectState} */
@Deprecated(forRemoval = true)
public static final @NotNull Icon ProjectState = DevkitCoreIcons.ProjectState;
/** @deprecated Use {@link DevkitCoreIcons#RemoteMapping} */
@Deprecated(forRemoval = true)
public static final @NotNull Icon RemoteMapping = DevkitCoreIcons.RemoteMapping;
/** @deprecated Use {@link DevkitCoreIcons#Sdk_closed} */
@Deprecated(forRemoval = true)
public static final @NotNull Icon Sdk_closed = DevkitCoreIcons.Sdk_closed;
/** @deprecated Use {@link DevkitCoreIcons#Service} */
@Deprecated(forRemoval = true)
public static final @NotNull Icon Service = DevkitCoreIcons.Service;
/** @deprecated Use {@link DevkitCoreIcons#State} */
@Deprecated(forRemoval = true)
public static final @NotNull Icon State = DevkitCoreIcons.State;
}
plugins/devkit/devkit-core/resources/intellij.devkit.core.xml
+2 -2
View File
@@ -1,4 +1,4 @@
<idea-plugin visibility="public" package="org.jetbrains.idea.devkit">
<idea-plugin visibility="public">
<dependencies>
<plugin id="com.intellij.properties"/>
<plugin id="com.intellij.java"/>
@@ -888,7 +888,7 @@
<action id="DevKit.NewAction" class="org.jetbrains.idea.devkit.actions.templates.NewActionAction"
icon="AllIcons.Actions.RunAnything"/>
<action id="DevKit.NewService" class="org.jetbrains.idea.devkit.actions.templates.NewServiceAction"
icon="org.jetbrains.idea.devkit.DevKitIcons.Service"/>
icon="com.intellij.devkit.core.icons.DevkitCoreIcons.Service"/>
<action id="DevKit.NewState" class="org.jetbrains.idea.devkit.actions.templates.NewPersistentStateAction"
icon="AllIcons.Ide.ConfigFile"/>
<action id="DevKit.NewMessageBundleObject" class="org.jetbrains.idea.devkit.actions.templates.NewMessageBundleAction"
plugins/devkit/devkit-core/src/actions/templates/NewPersistentStateAction.kt
+3 -3
View File
@@ -1,6 +1,7 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.actions.templates
import com.intellij.devkit.core.icons.DevkitCoreIcons
import com.intellij.ide.actions.CreateFileFromTemplateAction
import com.intellij.ide.actions.CreateFileFromTemplateDialog
import com.intellij.openapi.actionSystem.DataContext
@@ -11,7 +12,6 @@ import com.intellij.psi.PsiDirectory
import com.intellij.psi.PsiFile
import org.jetbrains.annotations.NonNls
import org.jetbrains.idea.devkit.DevKitBundle
import org.jetbrains.idea.devkit.DevKitIcons
import org.jetbrains.idea.devkit.actions.DevkitActionsUtil
import org.jetbrains.idea.devkit.dom.IdeaPlugin
import org.jetbrains.idea.devkit.util.DescriptorUtil
@@ -25,8 +25,8 @@ internal class NewPersistentStateAction : CreateFileFromTemplateAction() {
override fun buildDialog(project: Project, directory: PsiDirectory, builder: CreateFileFromTemplateDialog.Builder) {
builder
.setTitle(DevKitBundle.message("dialog.title.new.devkit.state"))
.addKind(DevKitBundle.message("list.item.applications.state"), DevKitIcons.State, DEVKIT_APPLICATION_STATE_TEMPLATE)
.addKind(DevKitBundle.message("list.item.project.state"), DevKitIcons.ProjectState, DEVKIT_PROJECT_STATE_TEMPLATE)
.addKind(DevKitBundle.message("list.item.applications.state"), DevkitCoreIcons.State, DEVKIT_APPLICATION_STATE_TEMPLATE)
.addKind(DevKitBundle.message("list.item.project.state"), DevkitCoreIcons.ProjectState, DEVKIT_PROJECT_STATE_TEMPLATE)
.setDefaultText("MySettingsService")
}
plugins/devkit/devkit-core/src/actions/templates/NewServiceAction.kt
+3 -3
View File
@@ -1,6 +1,7 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.actions.templates
import com.intellij.devkit.core.icons.DevkitCoreIcons
import com.intellij.ide.actions.CreateFileFromTemplateAction
import com.intellij.ide.actions.CreateFileFromTemplateDialog
import com.intellij.openapi.actionSystem.DataContext
@@ -9,7 +10,6 @@ import com.intellij.openapi.util.NlsContexts
import com.intellij.psi.PsiDirectory
import org.jetbrains.annotations.NonNls
import org.jetbrains.idea.devkit.DevKitBundle
import org.jetbrains.idea.devkit.DevKitIcons
private const val DEVKIT_APPLICATION_SERVICE_TEMPLATE = "DevKit Application Service"
private const val DEVKIT_PROJECT_SERVICE_TEMPLATE = "DevKit Project Service"
@@ -18,8 +18,8 @@ internal class NewServiceAction : CreateFileFromTemplateAction() {
override fun buildDialog(project: Project, directory: PsiDirectory, builder: CreateFileFromTemplateDialog.Builder) {
builder
.setTitle(DevKitBundle.message("dialog.title.new.devkit.service"))
.addKind(DevKitBundle.message("list.item.applications.service"), DevKitIcons.Service, DEVKIT_APPLICATION_SERVICE_TEMPLATE)
.addKind(DevKitBundle.message("list.item.project.service"), DevKitIcons.ProjectService, DEVKIT_PROJECT_SERVICE_TEMPLATE)
.addKind(DevKitBundle.message("list.item.applications.service"), DevkitCoreIcons.Service, DEVKIT_APPLICATION_SERVICE_TEMPLATE)
.addKind(DevKitBundle.message("list.item.project.service"), DevkitCoreIcons.ProjectService, DEVKIT_PROJECT_SERVICE_TEMPLATE)
.setDefaultText("MyService")
}
plugins/devkit/devkit-core/src/dom/impl/PluginDescriptorDomFileDescription.java
+2 -2
View File
@@ -1,13 +1,13 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.dom.impl;
import com.intellij.devkit.core.icons.DevkitCoreIcons;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.util.Iconable;
import com.intellij.psi.xml.XmlFile;
import com.intellij.util.xml.DomFileDescription;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.devkit.DevKitIcons;
import org.jetbrains.idea.devkit.dom.IdeaPlugin;
import org.jetbrains.idea.devkit.util.DescriptorUtil;
@@ -25,7 +25,7 @@ final class PluginDescriptorDomFileDescription extends DomFileDescription<IdeaPl
if (ideaPlugin == null) return null;
if (ideaPlugin.isV2Descriptor()) {
return DevKitIcons.PluginV2;
return DevkitCoreIcons.PluginV2;
}
return AllIcons.Nodes.Plugin;
plugins/devkit/devkit-core/src/navigation/DescriptionTypeRelatedItemLineMarkerProvider.java
+5 -5
View File
@@ -3,6 +3,7 @@ package org.jetbrains.idea.devkit.navigation;
import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo;
import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder;
import com.intellij.devkit.core.icons.DevkitCoreIcons;
import com.intellij.navigation.GotoRelatedItem;
import com.intellij.openapi.editor.markup.GutterIconRenderer;
import com.intellij.openapi.module.Module;
@@ -14,7 +15,6 @@ import com.intellij.util.NotNullFunction;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.devkit.DevKitBundle;
import org.jetbrains.idea.devkit.DevKitIcons;
import org.jetbrains.idea.devkit.inspections.DescriptionType;
import org.jetbrains.idea.devkit.inspections.DescriptionTypeResolver;
import org.jetbrains.idea.devkit.util.PsiUtil;
@@ -32,10 +32,10 @@ final class DescriptionTypeRelatedItemLineMarkerProvider extends DevkitRelatedCl
private final Option myDescriptionOption = new Option("devkit.description",
DevKitBundle.message("gutter.related.option.description"),
DevKitIcons.Gutter.DescriptionFile);
DevkitCoreIcons.Gutter.DescriptionFile);
private final Option myBeforeAfterOption = new Option("devkit.beforeAfter",
DevKitBundle.message("gutter.related.option.before.after.templates"),
DevKitIcons.Gutter.Diff);
DevkitCoreIcons.Gutter.Diff);
@Override
public Option @NotNull [] getOptions() {
@@ -88,7 +88,7 @@ final class DescriptionTypeRelatedItemLineMarkerProvider extends DevkitRelatedCl
PsiFile descriptionFile,
Collection<? super RelatedItemLineMarkerInfo<?>> result) {
final RelatedItemLineMarkerInfo<PsiElement> info = NavigationGutterIconBuilder
.create(DevKitIcons.Gutter.DescriptionFile, CONVERTER, RELATED_ITEM_PROVIDER)
.create(DevkitCoreIcons.Gutter.DescriptionFile, CONVERTER, RELATED_ITEM_PROVIDER)
.setTarget(descriptionFile)
.setTooltipText(DevKitBundle.message("gutter.related.navigation.popup.description.tooltip"))
.setAlignment(GutterIconRenderer.Alignment.RIGHT)
@@ -101,7 +101,7 @@ final class DescriptionTypeRelatedItemLineMarkerProvider extends DevkitRelatedCl
Collection<? super RelatedItemLineMarkerInfo<?>> result) {
//noinspection DialogTitleCapitalization
final RelatedItemLineMarkerInfo<PsiElement> info = NavigationGutterIconBuilder
.create(DevKitIcons.Gutter.Diff, CONVERTER, RELATED_ITEM_PROVIDER)
.create(DevkitCoreIcons.Gutter.Diff, CONVERTER, RELATED_ITEM_PROVIDER)
.setTargets(templateFiles)
.setPopupTitle(DevKitBundle.message("gutter.related.navigation.popup.template.title"))
.setTooltipText(DevKitBundle.message("gutter.related.navigation.popup.template.tooltip"))
plugins/devkit/devkit-core/src/navigation/DescriptorsIncludingContentModuleLineMarkerProvider.kt
+2 -2
View File
@@ -4,6 +4,7 @@ package org.jetbrains.idea.devkit.navigation
import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo
import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder
import com.intellij.codeInsight.navigation.impl.PsiTargetPresentationRenderer
import com.intellij.devkit.core.icons.DevkitCoreIcons
import com.intellij.icons.AllIcons
import com.intellij.navigation.GotoRelatedItem
import com.intellij.openapi.editor.markup.GutterIconRenderer
@@ -18,7 +19,6 @@ import com.intellij.util.NotNullFunction
import com.intellij.util.xml.DomUtil
import org.jetbrains.annotations.Nls
import org.jetbrains.idea.devkit.DevKitBundle
import org.jetbrains.idea.devkit.DevKitIcons
import org.jetbrains.idea.devkit.dom.ContentDescriptor.ModuleDescriptor
import org.jetbrains.idea.devkit.dom.IdeaPlugin
import org.jetbrains.idea.devkit.dom.index.PluginIdDependenciesIndex
@@ -85,7 +85,7 @@ internal class DescriptorsIncludingContentModuleLineMarkerProvider : DevkitRelat
val module = ProjectRootManager.getInstance(element.project).getFileIndex().getModuleForFile(element.containingFile.virtualFile)
?: return super.getPresentation(element)
return TargetPresentation.builder(element.containingFile.name)
.icon(DevKitIcons.PluginV2)
.icon(DevkitCoreIcons.PluginV2)
.containerText(getLoading(element))
.locationText(module.name, AllIcons.Nodes.Module)
.presentation()
plugins/devkit/devkit-core/src/navigation/LineMarkerInfoHelper.java
+2 -2
View File
@@ -5,6 +5,7 @@ import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo;
import com.intellij.codeInsight.navigation.DomGotoRelatedItem;
import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder;
import com.intellij.codeInsight.navigation.impl.PsiTargetPresentationRenderer;
import com.intellij.devkit.core.icons.DevkitCoreIcons;
import com.intellij.openapi.editor.markup.GutterIconRenderer;
import com.intellij.openapi.fileEditor.UniqueVFilePathBuilder;
import com.intellij.openapi.util.NlsSafe;
@@ -20,7 +21,6 @@ import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.devkit.DevKitBundle;
import org.jetbrains.idea.devkit.DevKitIcons;
import org.jetbrains.idea.devkit.dom.*;
import org.jetbrains.idea.devkit.dom.Action;
import org.jetbrains.idea.devkit.util.ActionCandidate;
@@ -103,7 +103,7 @@ final class LineMarkerInfoHelper {
@Nls(capitalization = Nls.Capitalization.Title) String popup,
NullableFunction<T, @NlsSafe String> namer) {
return NavigationGutterIconBuilder
.create(DevKitIcons.Gutter.Plugin, CONVERTER, target -> {
.create(DevkitCoreIcons.Gutter.Plugin, CONVERTER, target -> {
DomElement domElement = DomUtil.getDomElement(target.pointer.getElement());
return Collections.singletonList(new DomGotoRelatedItem(domElement, "DevKit") {
@Override
plugins/devkit/devkit-core/src/navigation/PluginDescriptorDeclarationRelatedItemLineMarkerProvider.java
+2 -2
View File
@@ -2,6 +2,7 @@
package org.jetbrains.idea.devkit.navigation;
import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo;
import com.intellij.devkit.core.icons.DevkitCoreIcons;
import com.intellij.openapi.actionSystem.ActionGroup;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiClass;
@@ -12,7 +13,6 @@ import com.intellij.psi.util.InheritanceUtil;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.devkit.DevKitBundle;
import org.jetbrains.idea.devkit.DevKitIcons;
import org.jetbrains.idea.devkit.dom.index.IdeaPluginRegistrationIndex;
import org.jetbrains.idea.devkit.util.*;
@@ -38,7 +38,7 @@ final class PluginDescriptorDeclarationRelatedItemLineMarkerProvider extends Dev
@Override
public @NotNull Icon getIcon() {
return DevKitIcons.Gutter.Plugin;
return DevkitCoreIcons.Gutter.Plugin;
}
@Override
plugins/devkit/devkit-core/src/references/DevKitRelatedPropertiesProvider.java
+3 -3
View File
@@ -3,6 +3,7 @@ package org.jetbrains.idea.devkit.references;
import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo;
import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder;
import com.intellij.devkit.core.icons.DevkitCoreIcons;
import com.intellij.lang.properties.psi.PropertiesFile;
import com.intellij.lang.properties.psi.Property;
import com.intellij.navigation.GotoRelatedItem;
@@ -23,7 +24,6 @@ import com.intellij.util.xml.DomUtil;
import com.intellij.util.xml.GenericDomValue;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.devkit.DevKitBundle;
import org.jetbrains.idea.devkit.DevKitIcons;
import org.jetbrains.idea.devkit.dom.ActionOrGroup;
import org.jetbrains.idea.devkit.dom.OverrideText;
import org.jetbrains.idea.devkit.navigation.DevkitRelatedLineMarkerProviderBase;
@@ -56,7 +56,7 @@ final class DevKitRelatedPropertiesProvider extends DevkitRelatedLineMarkerProvi
@Override
public @NotNull Icon getIcon() {
return DevKitIcons.Gutter.Properties;
return DevkitCoreIcons.Gutter.Properties;
}
@Override
@@ -98,7 +98,7 @@ final class DevKitRelatedPropertiesProvider extends DevkitRelatedLineMarkerProvi
if (query.findFirst() == null) return;
result.add(
NavigationGutterIconBuilder.create(DevKitIcons.Gutter.Properties,
NavigationGutterIconBuilder.create(DevkitCoreIcons.Gutter.Properties,
e -> Collections.singletonList(((PsiElement)e)),
e -> Collections.singletonList(new GotoRelatedItem((PsiElement)e)))
.setTargets(NotNullLazyValue.createValue(() -> {
plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/descriptor/PluginDescriptorTest.kt
+4 -4
View File
@@ -1,12 +1,12 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.descriptor
import com.intellij.devkit.core.icons.DevkitCoreIcons
import com.intellij.icons.AllIcons
import com.intellij.psi.PsiElement
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
import com.intellij.ui.IconTestUtil
import com.intellij.util.PsiIconUtil
import org.jetbrains.idea.devkit.DevKitIcons
import javax.swing.Icon
internal class PluginDescriptorTest : LightJavaCodeInsightFixtureTestCase() {
@@ -16,13 +16,13 @@ internal class PluginDescriptorTest : LightJavaCodeInsightFixtureTestCase() {
assertPsiIcon(pluginXml, AllIcons.Nodes.Plugin)
val v2PluginXmlPackage = myFixture.configureByText("plugin_v2.xml", "<idea-plugin package=\"dummy\"></idea-plugin>")
assertPsiIcon(v2PluginXmlPackage, DevKitIcons.PluginV2)
assertPsiIcon(v2PluginXmlPackage, DevkitCoreIcons.PluginV2)
val v2PluginXmlContent = myFixture.configureByText("plugin_v2.xml", "<idea-plugin><content/></idea-plugin>")
assertPsiIcon(v2PluginXmlContent, DevKitIcons.PluginV2)
assertPsiIcon(v2PluginXmlContent, DevkitCoreIcons.PluginV2)
val v2PluginXmlDependencies = myFixture.configureByText("plugin_v2.xml", "<idea-plugin><dependencies/></idea-plugin>")
assertPsiIcon(v2PluginXmlDependencies, DevKitIcons.PluginV2)
assertPsiIcon(v2PluginXmlDependencies, DevkitCoreIcons.PluginV2)
}
private fun assertPsiIcon(psiElement: PsiElement, expectedIcon: Icon) {
plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/navigation/ActionDeclarationRelatedItemLineMarkerProviderTest.java
+4 -4
View File
@@ -4,6 +4,7 @@ package org.jetbrains.idea.devkit.navigation;
import com.intellij.codeInsight.daemon.GutterMark;
import com.intellij.codeInsight.navigation.DomGotoRelatedItem;
import com.intellij.codeInsight.navigation.NavigationUtil;
import com.intellij.devkit.core.icons.DevkitCoreIcons;
import com.intellij.icons.AllIcons;
import com.intellij.navigation.GotoRelatedItem;
import com.intellij.openapi.actionSystem.AnAction;
@@ -14,7 +15,6 @@ import com.intellij.testFramework.builders.JavaModuleFixtureBuilder;
import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase;
import com.intellij.ui.components.JBList;
import com.intellij.util.PathUtil;
import org.jetbrains.idea.devkit.DevKitIcons;
import org.jetbrains.idea.devkit.DevkitJavaTestsUtil;
import java.util.List;
@@ -40,7 +40,7 @@ public class ActionDeclarationRelatedItemLineMarkerProviderTest extends JavaCode
GutterMark gutter = myFixture.findGutter("MyAction.java");
DevKitGutterTargetsChecker.checkGutterTargets(gutter,
buildTooltipText("singleDeclaration") ,
DevKitIcons.Gutter.Plugin, "action");
DevkitCoreIcons.Gutter.Plugin, "action");
}
public void testActionMultipleDeclarations() {
@@ -49,7 +49,7 @@ public class ActionDeclarationRelatedItemLineMarkerProviderTest extends JavaCode
GutterMark gutter = myFixture.findGutter("MyAction.java");
DevKitGutterTargetsChecker.checkGutterTargets(gutter,
buildTooltipText("firstDeclaration", "secondDeclaration"),
DevKitIcons.Gutter.Plugin, "action");
DevkitCoreIcons.Gutter.Plugin, "action");
List<GotoRelatedItem> relatedItems = NavigationUtil.collectRelatedItems(myFixture.findClass("MyAction"), SimpleDataContext.EMPTY_CONTEXT);
assertSize(2, relatedItems);
@@ -65,7 +65,7 @@ public class ActionDeclarationRelatedItemLineMarkerProviderTest extends JavaCode
GutterMark gutter = myFixture.findGutter("MyActionGroup.java");
DevKitGutterTargetsChecker.checkGutterTargets(gutter,
buildTooltipText("firstDeclaration", "secondDeclaration"),
DevKitIcons.Gutter.Plugin, "group");
DevkitCoreIcons.Gutter.Plugin, "group");
}
private static String buildTooltipText(String... actionIds) {
plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/navigation/ComponentDeclarationRelatedItemLineMarkerProviderTest.java
+4 -4
View File
@@ -2,10 +2,10 @@
package org.jetbrains.idea.devkit.navigation;
import com.intellij.codeInsight.daemon.GutterMark;
import com.intellij.devkit.core.icons.DevkitCoreIcons;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.testFramework.TestDataPath;
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
import org.jetbrains.idea.devkit.DevKitIcons;
import org.jetbrains.idea.devkit.DevkitJavaTestsUtil;
@TestDataPath("$CONTENT_ROOT/testData/navigation/componentDeclaration")
@@ -28,7 +28,7 @@ public class ComponentDeclarationRelatedItemLineMarkerProviderTest extends Light
GutterMark gutter = myFixture.findGutter("MyComponent.java");
DevKitGutterTargetsChecker.checkGutterTargets(gutter,
buildTooltipText("MyComponent"),
DevKitIcons.Gutter.Plugin, "component");
DevkitCoreIcons.Gutter.Plugin, "component");
}
public void testComponentMultipleDeclarations() {
@@ -37,7 +37,7 @@ public class ComponentDeclarationRelatedItemLineMarkerProviderTest extends Light
GutterMark gutter = myFixture.findGutter("MyComponent.java");
DevKitGutterTargetsChecker.checkGutterTargets(gutter,
buildTooltipText("ActualImplementation", "MyComponent"),
DevKitIcons.Gutter.Plugin, "component");
DevkitCoreIcons.Gutter.Plugin, "component");
}
public void testComponentInterfaceMultipleDeclarations() {
@@ -46,7 +46,7 @@ public class ComponentDeclarationRelatedItemLineMarkerProviderTest extends Light
GutterMark gutter = myFixture.findGutter("MyComponentInterface.java");
DevKitGutterTargetsChecker.checkGutterTargets(gutter,
buildTooltipText("AnotherComponent", "MyComponent"),
DevKitIcons.Gutter.Plugin, "component");
DevkitCoreIcons.Gutter.Plugin, "component");
}
private static String buildTooltipText(String... componentFqns) {
plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/navigation/DescriptionTypeRelatedItemLineMarkerProviderTest.java
+3 -3
View File
@@ -2,9 +2,9 @@
package org.jetbrains.idea.devkit.navigation;
import com.intellij.codeInsight.daemon.GutterMark;
import com.intellij.devkit.core.icons.DevkitCoreIcons;
import com.intellij.testFramework.TestDataPath;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.idea.devkit.DevKitIcons;
import org.jetbrains.idea.devkit.DevkitJavaTestsUtil;
import java.util.Comparator;
@@ -44,8 +44,8 @@ public class DescriptionTypeRelatedItemLineMarkerProviderTest extends Descriptio
List<GutterMark> gutters = ContainerUtil.sorted(myFixture.findAllGutters("MyIntentionActionWithDescription.java"),
Comparator.comparing(GutterMark::getTooltipText));
assertThat(gutters.size()).isEqualTo(2);
DevKitGutterTargetsChecker.checkGutterTargets(gutters.get(1), "Description", DevKitIcons.Gutter.DescriptionFile, "description.html");
DevKitGutterTargetsChecker.checkGutterTargets(gutters.get(0), "Before/After Templates", DevKitIcons.Gutter.Diff,
DevKitGutterTargetsChecker.checkGutterTargets(gutters.get(1), "Description", DevkitCoreIcons.Gutter.DescriptionFile, "description.html");
DevKitGutterTargetsChecker.checkGutterTargets(gutters.get(0), "Before/After Templates", DevkitCoreIcons.Gutter.Diff,
"after.java.template", "before.java.template");
}
plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/navigation/ListenerPluginDescriptorDeclarationRelatedItemLineMarkerProviderTest.java
+4 -4
View File
@@ -2,10 +2,10 @@
package org.jetbrains.idea.devkit.navigation;
import com.intellij.codeInsight.daemon.GutterMark;
import com.intellij.devkit.core.icons.DevkitCoreIcons;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.testFramework.TestDataPath;
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
import org.jetbrains.idea.devkit.DevKitIcons;
import org.jetbrains.idea.devkit.DevkitJavaTestsUtil;
@SuppressWarnings("NewClassNamingConvention")
@@ -29,7 +29,7 @@ public class ListenerPluginDescriptorDeclarationRelatedItemLineMarkerProviderTes
GutterMark gutter = myFixture.findGutter("MyListener.java");
DevKitGutterTargetsChecker.checkGutterTargets(gutter,
buildTooltipText("MyListenerTopic"),
DevKitIcons.Gutter.Plugin, "listener");
DevkitCoreIcons.Gutter.Plugin, "listener");
}
public void testListenerMultipleTopics() {
@@ -38,7 +38,7 @@ public class ListenerPluginDescriptorDeclarationRelatedItemLineMarkerProviderTes
GutterMark gutter = myFixture.findGutter("MyListener.java");
DevKitGutterTargetsChecker.checkGutterTargets(gutter,
buildTooltipText("AnotherTopic", "MyListenerTopic", "YetAnotherTopic"),
DevKitIcons.Gutter.Plugin, "listener");
DevkitCoreIcons.Gutter.Plugin, "listener");
}
public void testTopicMultipleListeners() {
@@ -47,7 +47,7 @@ public class ListenerPluginDescriptorDeclarationRelatedItemLineMarkerProviderTes
GutterMark gutter = myFixture.findGutter("MyTopic.java");
DevKitGutterTargetsChecker.checkGutterTargets(gutter,
buildTooltipText("AnotherListener", "MyListener"),
DevKitIcons.Gutter.Plugin, "listener");
DevkitCoreIcons.Gutter.Plugin, "listener");
}
private static String buildTooltipText(String... topics) {
plugins/devkit/devkit-tests/testSrc/org/jetbrains/idea/devkit/navigation/DescriptionTypeRelatedItemLineMarkerProviderTestBase.java
+2 -2
View File
@@ -3,12 +3,12 @@ package org.jetbrains.idea.devkit.navigation;
import com.intellij.codeInsight.daemon.GutterMark;
import com.intellij.codeInspection.LocalInspectionEP;
import com.intellij.devkit.core.icons.DevkitCoreIcons;
import com.intellij.testFramework.builders.JavaModuleFixtureBuilder;
import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase;
import com.intellij.ui.components.JBList;
import com.intellij.util.PathUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.devkit.DevKitIcons;
public abstract class DescriptionTypeRelatedItemLineMarkerProviderTestBase extends JavaCodeInsightFixtureTestCase {
@Override
@@ -20,6 +20,6 @@ public abstract class DescriptionTypeRelatedItemLineMarkerProviderTestBase exten
protected void doTestInspectionDescription(@NotNull String inspectionFile, @NotNull String descriptionFile) {
myFixture.copyDirectoryToProject("inspectionDescriptions", "inspectionDescriptions");
GutterMark gutter = myFixture.findGutter(inspectionFile);
DevKitGutterTargetsChecker.checkGutterTargets(gutter, "Description", DevKitIcons.Gutter.DescriptionFile, descriptionFile);
DevKitGutterTargetsChecker.checkGutterTargets(gutter, "Description", DevkitCoreIcons.Gutter.DescriptionFile, descriptionFile);
}
}
plugins/devkit/devkit-tests/testSrc/org/jetbrains/idea/devkit/navigation/ExtensionPluginDescriptorDeclarationRelatedItemLineMarkerProviderTestBase.java
+2 -2
View File
@@ -2,11 +2,11 @@
package org.jetbrains.idea.devkit.navigation;
import com.intellij.codeInsight.daemon.GutterMark;
import com.intellij.devkit.core.icons.DevkitCoreIcons;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile;
import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.devkit.DevKitIcons;
public abstract class ExtensionPluginDescriptorDeclarationRelatedItemLineMarkerProviderTestBase
extends LightJavaCodeInsightFixtureTestCase {
@@ -27,7 +27,7 @@ public abstract class ExtensionPluginDescriptorDeclarationRelatedItemLineMarkerP
GutterMark gutter = myFixture.findGutter(file);
DevKitGutterTargetsChecker.checkGutterTargets(gutter, "<html><body>&nbsp;&nbsp;&nbsp;&nbsp;com.intellij.myEp<br></body></html>",
DevKitIcons.Gutter.Plugin, "myEp");
DevkitCoreIcons.Gutter.Plugin, "myEp");
}
protected void doTestInvalidExtension(@NotNull String file) {
plugins/devkit/devkit-tests/testSrc/org/jetbrains/idea/devkit/navigation/ExtensionPointDeclarationRelatedItemLineMarkerProviderTestBase.java
+2 -2
View File
@@ -2,6 +2,7 @@
package org.jetbrains.idea.devkit.navigation;
import com.intellij.codeInsight.daemon.GutterMark;
import com.intellij.devkit.core.icons.DevkitCoreIcons;
import com.intellij.lang.LanguageExtension;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.util.text.StringUtil;
@@ -11,7 +12,6 @@ import com.intellij.testFramework.builders.JavaModuleFixtureBuilder;
import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase;
import com.intellij.ui.components.JBList;
import com.intellij.util.PathUtil;
import org.jetbrains.idea.devkit.DevKitIcons;
public abstract class ExtensionPointDeclarationRelatedItemLineMarkerProviderTestBase extends JavaCodeInsightFixtureTestCase {
@@ -38,6 +38,6 @@ public abstract class ExtensionPointDeclarationRelatedItemLineMarkerProviderTest
final GutterMark gutter = myFixture.findGutter(filePath);
DevKitGutterTargetsChecker.checkGutterTargets(gutter, "<html><body>&nbsp;&nbsp;&nbsp;&nbsp;" + epFqn + "<br></body></html>",
DevKitIcons.Gutter.Plugin, "extensionPoint");
DevkitCoreIcons.Gutter.Plugin, "extensionPoint");
}
}
plugins/devkit/intellij.devkit.compose/resources/intellij.devkit.compose.xml
+3 -3
View File
@@ -36,7 +36,7 @@
restartRequired="true" description="Enables Compose UI previews tool window"/>
<library.toolWindow id="ComposeUIPreview" anchor="right"
factoryClass="com.intellij.devkit.compose.preview.ComposePreviewToolWindowFactory"
icon="org.jetbrains.idea.devkit.DevKitIcons.ComposeToolWindow"
icon="com.intellij.devkit.core.icons.DevkitCoreIcons.ComposeToolWindow"
librarySearchClass="com.intellij.devkit.compose.preview.ComposePreviewSearcher"/>
<implicitUsageProvider implementation="com.intellij.devkit.compose.preview.ComposePreviewImplicitUsageProvider"/>
</extensions>
@@ -44,9 +44,9 @@
<actions>
<group id="ComposeToolsGroup" searchable="false">
<action id="JewelToolwindow" class="com.intellij.devkit.compose.demo.dialog.JewelToolwindowAction"
icon="org.jetbrains.idea.devkit.DevKitIcons.ComposeToolWindow"/>
icon="com.intellij.devkit.core.icons.DevkitCoreIcons.ComposeToolWindow"/>
<action id="JewelComponentShowcaseDialog" class="com.intellij.devkit.compose.demo.dialog.ComponentShowcaseDialogAction"
icon="org.jetbrains.idea.devkit.DevKitIcons.Items"/>
icon="com.intellij.devkit.core.icons.DevkitCoreIcons.Items"/>
<action id="JewelWizardDialog" class="com.intellij.devkit.compose.demo.dialog.JewelWizardDialogAction"/>
<action id="ComposeSandbox" class="com.intellij.devkit.compose.sandbox.ComposeSandboxAction" icon="AllIcons.FileTypes.UiForm"/>
plugins/devkit/intellij.devkit.compose/src/demo/dialog/JewelToolwindowAction.kt
+2 -2
View File
@@ -2,6 +2,7 @@
package com.intellij.devkit.compose.demo.dialog
import com.intellij.devkit.compose.DevkitComposeBundle
import com.intellij.devkit.core.icons.DevkitCoreIcons
import com.intellij.openapi.actionSystem.ActionUpdateThread
import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.project.DumbAwareAction
@@ -9,7 +10,6 @@ import com.intellij.openapi.wm.RegisterToolWindowTask
import com.intellij.openapi.wm.ToolWindow
import com.intellij.openapi.wm.ToolWindowAnchor
import com.intellij.openapi.wm.ToolWindowManager
import org.jetbrains.idea.devkit.DevKitIcons
private const val TOOLWINDOW_ID = "JewelDemo"
@@ -41,7 +41,7 @@ internal class JewelToolwindowAction : DumbAwareAction() {
id = TOOLWINDOW_ID,
anchor = ToolWindowAnchor.BOTTOM,
component = null,
icon = DevKitIcons.ComposeToolWindow,
icon = DevkitCoreIcons.ComposeToolWindow,
contentFactory = com.intellij.devkit.compose.demo.JewelDemoToolWindowFactory(),
stripeTitle = DevkitComposeBundle.messagePointer("jewel.toolwindow.title"),
)
plugins/devkit/intellij.devkit.scaffolding/src/ScaffoldingDirectoryIconProvider.kt
+3 -3
View File
@@ -1,6 +1,7 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.devkit.scaffolding
import com.intellij.devkit.core.icons.DevkitCoreIcons
import com.intellij.icons.AllIcons
import com.intellij.ide.IconProvider
import com.intellij.openapi.project.IntelliJProjectUtil
@@ -8,7 +9,6 @@ import com.intellij.openapi.util.registry.Registry
import com.intellij.psi.PsiDirectory
import com.intellij.psi.PsiElement
import com.intellij.ui.icons.IconWrapperWithToolTip
import org.jetbrains.idea.devkit.DevKitIcons
import java.util.function.Supplier
import javax.swing.Icon
@@ -37,10 +37,10 @@ internal class ScaffoldingDirectoryIconProvider : IconProvider() {
private val pluginDirectoryIcon = AllIcons.Nodes.Plugin
.withTooltip(messagePointer("plugin.directory.tooltip"))
private val moduleDirectoryIcon = DevKitIcons.PluginModule
private val moduleDirectoryIcon = DevkitCoreIcons.PluginModule
.withTooltip(messagePointer("module.directory.tooltip"))
private val legacyPluginWithModuleIcon = DevKitIcons.LegacyPluginModule
private val legacyPluginWithModuleIcon = DevkitCoreIcons.LegacyPluginModule
.withTooltip(messagePointer("plugin.and.module.directory.tooltip"))
private fun Icon.withTooltip(message: Supplier<String>): Icon {
plugins/devkit/intellij.kotlin.devkit/src/driver/RemoteIconProvider.kt
+3 -3
View File
@@ -2,10 +2,10 @@
package org.jetbrains.idea.devkit.kotlin.driver
import com.intellij.codeInsight.AnnotationUtil
import com.intellij.devkit.core.icons.DevkitCoreIcons
import com.intellij.ide.IconProvider
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiElement
import org.jetbrains.idea.devkit.DevKitIcons
import org.jetbrains.idea.devkit.driver.REMOTE_ANNOTATION_FQN
import org.jetbrains.kotlin.idea.refactoring.isInterfaceClass
import org.jetbrains.kotlin.psi.KtClassOrObject
@@ -18,14 +18,14 @@ internal class RemoteIconProvider : IconProvider() {
if (element is PsiClass
&& element.isInterface
&& AnnotationUtil.isAnnotated(element, REMOTE_ANNOTATION_FQN, 0)) {
return DevKitIcons.RemoteMapping
return DevkitCoreIcons.RemoteMapping
}
if (element is KtClassOrObject && element.isInterfaceClass()) {
val uCLass = element.toUElementOfType<UClass>()
val javaPsi = uCLass?.javaPsi
if (javaPsi != null && AnnotationUtil.isAnnotated(javaPsi, REMOTE_ANNOTATION_FQN, 0)) {
return DevKitIcons.RemoteMapping
return DevkitCoreIcons.RemoteMapping
}
}
plugins/devkit/plugin-content.yaml
+3 -1
View File
@@ -8,7 +8,6 @@
modules:
- name: intellij.devkit
contentModules:
- name: intellij.devkit.core
- name: intellij.devkit.gradle
- name: intellij.devkit.i18n
- name: intellij.devkit.intelliLang
@@ -27,6 +26,9 @@
- name: lib/modules/intellij.devkit.compose.jar
contentModules:
- name: intellij.devkit.compose
- name: lib/modules/intellij.devkit.core.jar
contentModules:
- name: intellij.devkit.core
- name: lib/modules/intellij.devkit.modules.jar
contentModules:
- name: intellij.devkit.modules
plugins/evaluation-plugin/languages/java/resources/intellij.evaluationPlugin.languages.java.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin package="com.intellij.cce.java">
<idea-plugin>
<dependencies>
<plugin id="com.intellij.java"/>
<plugin id="com.intellij.gradle"/>
plugins/evaluation-plugin/languages/kotlin/resources/intellij.evaluationPlugin.languages.kotlin.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin package="com.intellij.cce.kotlin">
<idea-plugin>
<dependencies>
<plugin id="org.jetbrains.kotlin"/>
</dependencies>
plugins/evaluation-plugin/languages/python/resources/intellij.evaluationPlugin.languages.python.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin package="com.intellij.cce.python">
<idea-plugin>
<dependencies>
<plugin id="com.intellij.modules.python"/>
</dependencies>
plugins/evaluation-plugin/plugin-content.yaml
+9 -3
View File
@@ -13,9 +13,6 @@
- name: intellij.evaluationPlugin.core
reason: <- intellij.evaluationPlugin
contentModules:
- name: intellij.evaluationPlugin.languages.java
- name: intellij.evaluationPlugin.languages.python
- name: intellij.evaluationPlugin.languages.kotlin
- name: intellij.evaluationPlugin.languages.cpp
- name: intellij.evaluationPlugin.languages.cppRd
- name: intellij.evaluationPlugin.languages.csharp
@@ -37,6 +34,15 @@
- name: intellij.evaluationPlugin.fullLine
- name: intellij.evaluationPlugin.agent
- name: intellij.evaluationPlugin.ijnext
- name: lib/modules/intellij.evaluationPlugin.languages.java.jar
contentModules:
- name: intellij.evaluationPlugin.languages.java
- name: lib/modules/intellij.evaluationPlugin.languages.kotlin.jar
contentModules:
- name: intellij.evaluationPlugin.languages.kotlin
- name: lib/modules/intellij.evaluationPlugin.languages.python.jar
contentModules:
- name: intellij.evaluationPlugin.languages.python
- name: lib/modules/intellij.evaluationPlugin.llm.jar
projectLibraries:
- name: jerolba.carpet.record
plugins/grazie/java/src/main/resources/intellij.grazie.java.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin package="com.intellij.grazie.ide.language.java">
<idea-plugin>
<dependencies>
<plugin id="com.intellij.java"/>
</dependencies>
plugins/grazie/plugin-content.yaml
+6 -2
View File
@@ -120,10 +120,8 @@
- name: intellij.grazie.core
reason: <- intellij.grazie
contentModules:
- name: intellij.grazie.java
- name: intellij.grazie.json
- name: intellij.grazie.markdown
- name: intellij.grazie.properties
- name: intellij.grazie.xml
- name: intellij.grazie.yaml
- name: lib/javax.measure-unit-api.jar
@@ -131,6 +129,12 @@
module: intellij.grazie.core
files:
- name: $MAVEN_REPOSITORY$/javax/measure/unit-api/1/unit-api-1.jar
- name: lib/modules/intellij.grazie.java.jar
contentModules:
- name: intellij.grazie.java
- name: lib/modules/intellij.grazie.properties.jar
contentModules:
- name: intellij.grazie.properties
- name: lib/net.loomchild-segment.jar
library: net.loomchild:segment:2.0.1
module: intellij.grazie.core
plugins/grazie/properties/src/main/resources/intellij.grazie.properties.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin package="com.intellij.grazie.ide.language.properties">
<idea-plugin>
<dependencies>
<plugin id="com.intellij.properties"/>
<module name="intellij.properties.backend"/>
plugins/groovy/structuralsearch-groovy/resources/META-INF/groovy-structural-search.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin package="com.intellij.structuralsearch.groovy">
<idea-plugin>
<extensions defaultExtensionNs="org.intellij.groovy">
<membersContributor implementation="com.intellij.structuralsearch.groovy.IdeaOpenApiNonCodeMembersContributor"/>
</extensions>
plugins/javaFX/community/resources/META-INF/plugin.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin package="org.jetbrains.plugins.javaFX">
<idea-plugin>
<name>JavaFX</name>
<id>org.jetbrains.plugins.javaFX</id>
<vendor>JetBrains</vendor>
plugins/markdown/core/plugin-content.yaml
+3 -1
View File
@@ -1,7 +1,6 @@
- name: lib/markdown.jar
contentModules:
- name: intellij.markdown
- name: intellij.markdown.fenceInjection
- name: intellij.markdown.frontmatter
- name: intellij.markdown.frontmatter.yaml
- name: intellij.markdown.frontmatter.toml
@@ -13,6 +12,9 @@
- name: lib/modules/intellij.markdown.backend.jar
contentModules:
- name: intellij.markdown.backend
- name: lib/modules/intellij.markdown.fenceInjection.jar
contentModules:
- name: intellij.markdown.fenceInjection
- name: lib/modules/intellij.markdown.frontend.jar
contentModules:
- name: intellij.markdown.frontend
plugins/markdown/fenceInjection/src/main/resources/intellij.markdown.fenceInjection.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin package="org.intellij.plugins.markdown.fenceInjection">
<idea-plugin>
<dependencies>
<module name="intellij.platform.langInjection"/>
</dependencies>
plugins/performanceTesting/scripts-ui/resources/META-INF/plugin.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin package="com.jetbrains.performanceScripts">
<idea-plugin>
<id>com.jetbrains.performanceScripts</id>
<name>Performance Scripts UI</name>
<vendor>JetBrains</vendor>
plugins/settings-sync/jba/plugin-content.yaml
+1 -9
View File
@@ -3,14 +3,6 @@
files:
- name: $MAVEN_REPOSITORY$/com/jetbrains/cloudconfig/cloudconfig/2023/cloudconfig-2023.jar
reason: <- intellij.settingsSync
- name: lib/jetbrains.intellij.deps.eclipse.jgit.jar
library: jetbrains.intellij.deps.eclipse.jgit
files:
- name: $MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/org.eclipse.jgit/6/org.eclipse.jgit-6.jar
- name: $MAVEN_REPOSITORY$/com/googlecode/javaewah/JavaEWAH/1/JavaEWAH-1.jar
reason: <- intellij.settingsSync.core
- name: lib/settingsSync.jar
modules:
- name: intellij.settingsSync
- name: intellij.settingsSync.core
reason: <- intellij.settingsSync
- name: intellij.settingsSync
plugins/settings-sync/jba/resources/META-INF/plugin.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin package="com.intellij.settingsSync.jba" allow-bundled-update="true">
<idea-plugin allow-bundled-update="true">
<name>Backup and Sync</name>
<id>com.intellij.settingsSync</id>
<category>IDE Settings</category>
plugins/settings-sync/jba/resources/intellij.settingsSync.performance.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin package="com.intellij.settingsSync.jba.performanceTesting">
<idea-plugin>
<dependencies>
<plugin id="com.jetbrains.performancePlugin"/>
</dependencies>
plugins/sh/plugin/resources/META-INF/plugin.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" package="com.intellij.sh" allow-bundled-update="true">
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" allow-bundled-update="true">
<id>com.jetbrains.sh</id>
<vendor>JetBrains</vendor>
<name>Shell Script</name>
plugins/toml/json/src/main/resources/intellij.toml.json.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin visibility="internal" package="org.toml.ide.json">
<idea-plugin visibility="internal">
<dependencies>
<module name="intellij.toml.core"/>
<module name="intellij.platform.backend"/>
plugins/toml/plugin-content.yaml
+3 -1
View File
@@ -7,10 +7,12 @@
- name: lib/modules/intellij.toml.frontend.split.jar
contentModules:
- name: intellij.toml.frontend.split
- name: lib/modules/intellij.toml.json.jar
contentModules:
- name: intellij.toml.json
- name: lib/toml.jar
modules:
- name: intellij.toml
contentModules:
- name: intellij.toml.core
- name: intellij.toml.json
- name: intellij.toml.grazie
plugins/turboComplete/languages/kotlin/k1/resources/intellij.turboComplete.languages.kotlin.k1.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin package="com.intellij.turboComplete.languages.kotlin.k1">
<idea-plugin>
<dependencies>
<plugin id="org.jetbrains.kotlin"/>
</dependencies>
plugins/turboComplete/resources/META-INF/plugin.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<idea-plugin package="com.intellij.turboComplete">
<idea-plugin>
<id>com.intellij.turboComplete</id>
<name>Turbo Complete</name>
<vendor>JetBrains</vendor>