From 6782a69c0a129e7a28c6e728e07da6bc7130af47 Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Thu, 29 Jul 2021 23:42:58 +0200 Subject: [PATCH] Extract facet and module api to lang-core, remove dependency vfs.impl->platform.lang GitOrigin-RevId: 31bb5a5392f4ee16f6419ef979f90008dc339ad0 --- .../{lang-api => lang-core}/src/com/intellij/facet/Facet.java | 0 .../src/com/intellij/facet/FacetConfiguration.java | 0 .../src/com/intellij/facet/FacetManager.java | 0 .../src/com/intellij/facet/FacetManagerListener.java | 0 .../src/com/intellij/facet/FacetModel.java | 0 .../src/com/intellij/facet/FacetType.java | 0 .../src/com/intellij/facet/FacetTypeId.java | 0 .../src/com/intellij/facet/ModifiableFacetModel.java | 0 .../src/com/intellij/facet/ui/DefaultFacetSettingsEditor.java | 0 .../src/com/intellij/facet/ui/FacetConfigurationQuickFix.java | 0 .../src/com/intellij/facet/ui/FacetEditor.java | 0 .../src/com/intellij/facet/ui/FacetEditorContext.java | 0 .../src/com/intellij/facet/ui/FacetEditorTab.java | 0 .../src/com/intellij/facet/ui/FacetEditorValidator.java | 0 .../src/com/intellij/facet/ui/FacetValidatorsManager.java | 0 .../src/com/intellij/facet/ui/MultipleFacetSettingsEditor.java | 0 .../src/com/intellij/facet/ui/ValidationResult.java | 0 .../com/intellij/ide/util/frameworkSupport/FrameworkRole.java | 0 .../intellij/ide/util/projectWizard/AbstractModuleBuilder.java | 0 .../src/com/intellij/ide/util/projectWizard/ModuleBuilder.java | 0 .../intellij/ide/util/projectWizard/ModuleBuilderFactory.java | 0 .../intellij/ide/util/projectWizard/ModuleBuilderListener.java | 0 .../ide/util/projectWizard/ModuleNameLocationSettings.java | 0 .../com/intellij/ide/util/projectWizard/ModuleWizardStep.java | 0 .../src/com/intellij/ide/util/projectWizard/ProjectBuilder.java | 0 .../ide/util/projectWizard/ProjectTemplateParameterFactory.java | 0 .../src/com/intellij/ide/util/projectWizard/SettingsStep.java | 0 .../src/com/intellij/ide/util/projectWizard/WizardContext.java | 0 .../com/intellij/ide/util/projectWizard/WizardInputField.java | 0 .../src/com/intellij/openapi/module/InternalModuleType.java | 0 .../com/intellij/openapi/module/ModuleConfigurationEditor.java | 0 .../src/com/intellij/openapi/module/ModuleType.java | 0 .../src/com/intellij/openapi/module/ModuleTypeManager.java | 0 .../openapi/roots/ui/configuration/DefaultModulesProvider.java | 0 .../intellij/openapi/roots/ui/configuration/FacetsProvider.java | 0 .../ui/configuration/ModuleConfigurationEditorProvider.java | 0 .../ui/configuration/ModuleConfigurationEditorProviderEx.java | 0 .../roots/ui/configuration/ModuleConfigurationState.java | 0 .../openapi/roots/ui/configuration/ModulesProvider.java | 0 .../src/com/intellij/platform/ProjectTemplate.java | 0 platform/vfs-impl/intellij.platform.vfs.impl.iml | 2 +- 41 files changed, 1 insertion(+), 1 deletion(-) rename platform/{lang-api => lang-core}/src/com/intellij/facet/Facet.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/facet/FacetConfiguration.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/facet/FacetManager.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/facet/FacetManagerListener.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/facet/FacetModel.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/facet/FacetType.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/facet/FacetTypeId.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/facet/ModifiableFacetModel.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/facet/ui/DefaultFacetSettingsEditor.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/facet/ui/FacetConfigurationQuickFix.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/facet/ui/FacetEditor.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/facet/ui/FacetEditorContext.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/facet/ui/FacetEditorTab.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/facet/ui/FacetEditorValidator.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/facet/ui/FacetValidatorsManager.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/facet/ui/MultipleFacetSettingsEditor.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/facet/ui/ValidationResult.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/ide/util/frameworkSupport/FrameworkRole.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/ide/util/projectWizard/ModuleBuilderFactory.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/ide/util/projectWizard/ModuleBuilderListener.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/ide/util/projectWizard/ModuleNameLocationSettings.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/ide/util/projectWizard/ModuleWizardStep.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/ide/util/projectWizard/ProjectBuilder.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/ide/util/projectWizard/ProjectTemplateParameterFactory.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/ide/util/projectWizard/SettingsStep.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/ide/util/projectWizard/WizardContext.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/ide/util/projectWizard/WizardInputField.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/openapi/module/InternalModuleType.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/openapi/module/ModuleConfigurationEditor.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/openapi/module/ModuleType.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/openapi/module/ModuleTypeManager.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/openapi/roots/ui/configuration/FacetsProvider.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationEditorProvider.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationEditorProviderEx.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationState.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java (100%) rename platform/{lang-api => lang-core}/src/com/intellij/platform/ProjectTemplate.java (100%) diff --git a/platform/lang-api/src/com/intellij/facet/Facet.java b/platform/lang-core/src/com/intellij/facet/Facet.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/Facet.java rename to platform/lang-core/src/com/intellij/facet/Facet.java diff --git a/platform/lang-api/src/com/intellij/facet/FacetConfiguration.java b/platform/lang-core/src/com/intellij/facet/FacetConfiguration.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/FacetConfiguration.java rename to platform/lang-core/src/com/intellij/facet/FacetConfiguration.java diff --git a/platform/lang-api/src/com/intellij/facet/FacetManager.java b/platform/lang-core/src/com/intellij/facet/FacetManager.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/FacetManager.java rename to platform/lang-core/src/com/intellij/facet/FacetManager.java diff --git a/platform/lang-api/src/com/intellij/facet/FacetManagerListener.java b/platform/lang-core/src/com/intellij/facet/FacetManagerListener.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/FacetManagerListener.java rename to platform/lang-core/src/com/intellij/facet/FacetManagerListener.java diff --git a/platform/lang-api/src/com/intellij/facet/FacetModel.java b/platform/lang-core/src/com/intellij/facet/FacetModel.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/FacetModel.java rename to platform/lang-core/src/com/intellij/facet/FacetModel.java diff --git a/platform/lang-api/src/com/intellij/facet/FacetType.java b/platform/lang-core/src/com/intellij/facet/FacetType.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/FacetType.java rename to platform/lang-core/src/com/intellij/facet/FacetType.java diff --git a/platform/lang-api/src/com/intellij/facet/FacetTypeId.java b/platform/lang-core/src/com/intellij/facet/FacetTypeId.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/FacetTypeId.java rename to platform/lang-core/src/com/intellij/facet/FacetTypeId.java diff --git a/platform/lang-api/src/com/intellij/facet/ModifiableFacetModel.java b/platform/lang-core/src/com/intellij/facet/ModifiableFacetModel.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/ModifiableFacetModel.java rename to platform/lang-core/src/com/intellij/facet/ModifiableFacetModel.java diff --git a/platform/lang-api/src/com/intellij/facet/ui/DefaultFacetSettingsEditor.java b/platform/lang-core/src/com/intellij/facet/ui/DefaultFacetSettingsEditor.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/ui/DefaultFacetSettingsEditor.java rename to platform/lang-core/src/com/intellij/facet/ui/DefaultFacetSettingsEditor.java diff --git a/platform/lang-api/src/com/intellij/facet/ui/FacetConfigurationQuickFix.java b/platform/lang-core/src/com/intellij/facet/ui/FacetConfigurationQuickFix.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/ui/FacetConfigurationQuickFix.java rename to platform/lang-core/src/com/intellij/facet/ui/FacetConfigurationQuickFix.java diff --git a/platform/lang-api/src/com/intellij/facet/ui/FacetEditor.java b/platform/lang-core/src/com/intellij/facet/ui/FacetEditor.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/ui/FacetEditor.java rename to platform/lang-core/src/com/intellij/facet/ui/FacetEditor.java diff --git a/platform/lang-api/src/com/intellij/facet/ui/FacetEditorContext.java b/platform/lang-core/src/com/intellij/facet/ui/FacetEditorContext.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/ui/FacetEditorContext.java rename to platform/lang-core/src/com/intellij/facet/ui/FacetEditorContext.java diff --git a/platform/lang-api/src/com/intellij/facet/ui/FacetEditorTab.java b/platform/lang-core/src/com/intellij/facet/ui/FacetEditorTab.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/ui/FacetEditorTab.java rename to platform/lang-core/src/com/intellij/facet/ui/FacetEditorTab.java diff --git a/platform/lang-api/src/com/intellij/facet/ui/FacetEditorValidator.java b/platform/lang-core/src/com/intellij/facet/ui/FacetEditorValidator.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/ui/FacetEditorValidator.java rename to platform/lang-core/src/com/intellij/facet/ui/FacetEditorValidator.java diff --git a/platform/lang-api/src/com/intellij/facet/ui/FacetValidatorsManager.java b/platform/lang-core/src/com/intellij/facet/ui/FacetValidatorsManager.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/ui/FacetValidatorsManager.java rename to platform/lang-core/src/com/intellij/facet/ui/FacetValidatorsManager.java diff --git a/platform/lang-api/src/com/intellij/facet/ui/MultipleFacetSettingsEditor.java b/platform/lang-core/src/com/intellij/facet/ui/MultipleFacetSettingsEditor.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/ui/MultipleFacetSettingsEditor.java rename to platform/lang-core/src/com/intellij/facet/ui/MultipleFacetSettingsEditor.java diff --git a/platform/lang-api/src/com/intellij/facet/ui/ValidationResult.java b/platform/lang-core/src/com/intellij/facet/ui/ValidationResult.java similarity index 100% rename from platform/lang-api/src/com/intellij/facet/ui/ValidationResult.java rename to platform/lang-core/src/com/intellij/facet/ui/ValidationResult.java diff --git a/platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkRole.java b/platform/lang-core/src/com/intellij/ide/util/frameworkSupport/FrameworkRole.java similarity index 100% rename from platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkRole.java rename to platform/lang-core/src/com/intellij/ide/util/frameworkSupport/FrameworkRole.java diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java b/platform/lang-core/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java similarity index 100% rename from platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java rename to platform/lang-core/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java b/platform/lang-core/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java similarity index 100% rename from platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java rename to platform/lang-core/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilderFactory.java b/platform/lang-core/src/com/intellij/ide/util/projectWizard/ModuleBuilderFactory.java similarity index 100% rename from platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilderFactory.java rename to platform/lang-core/src/com/intellij/ide/util/projectWizard/ModuleBuilderFactory.java diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilderListener.java b/platform/lang-core/src/com/intellij/ide/util/projectWizard/ModuleBuilderListener.java similarity index 100% rename from platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilderListener.java rename to platform/lang-core/src/com/intellij/ide/util/projectWizard/ModuleBuilderListener.java diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleNameLocationSettings.java b/platform/lang-core/src/com/intellij/ide/util/projectWizard/ModuleNameLocationSettings.java similarity index 100% rename from platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleNameLocationSettings.java rename to platform/lang-core/src/com/intellij/ide/util/projectWizard/ModuleNameLocationSettings.java diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleWizardStep.java b/platform/lang-core/src/com/intellij/ide/util/projectWizard/ModuleWizardStep.java similarity index 100% rename from platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleWizardStep.java rename to platform/lang-core/src/com/intellij/ide/util/projectWizard/ModuleWizardStep.java diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectBuilder.java b/platform/lang-core/src/com/intellij/ide/util/projectWizard/ProjectBuilder.java similarity index 100% rename from platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectBuilder.java rename to platform/lang-core/src/com/intellij/ide/util/projectWizard/ProjectBuilder.java diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectTemplateParameterFactory.java b/platform/lang-core/src/com/intellij/ide/util/projectWizard/ProjectTemplateParameterFactory.java similarity index 100% rename from platform/lang-api/src/com/intellij/ide/util/projectWizard/ProjectTemplateParameterFactory.java rename to platform/lang-core/src/com/intellij/ide/util/projectWizard/ProjectTemplateParameterFactory.java diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/SettingsStep.java b/platform/lang-core/src/com/intellij/ide/util/projectWizard/SettingsStep.java similarity index 100% rename from platform/lang-api/src/com/intellij/ide/util/projectWizard/SettingsStep.java rename to platform/lang-core/src/com/intellij/ide/util/projectWizard/SettingsStep.java diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardContext.java b/platform/lang-core/src/com/intellij/ide/util/projectWizard/WizardContext.java similarity index 100% rename from platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardContext.java rename to platform/lang-core/src/com/intellij/ide/util/projectWizard/WizardContext.java diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardInputField.java b/platform/lang-core/src/com/intellij/ide/util/projectWizard/WizardInputField.java similarity index 100% rename from platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardInputField.java rename to platform/lang-core/src/com/intellij/ide/util/projectWizard/WizardInputField.java diff --git a/platform/lang-api/src/com/intellij/openapi/module/InternalModuleType.java b/platform/lang-core/src/com/intellij/openapi/module/InternalModuleType.java similarity index 100% rename from platform/lang-api/src/com/intellij/openapi/module/InternalModuleType.java rename to platform/lang-core/src/com/intellij/openapi/module/InternalModuleType.java diff --git a/platform/lang-api/src/com/intellij/openapi/module/ModuleConfigurationEditor.java b/platform/lang-core/src/com/intellij/openapi/module/ModuleConfigurationEditor.java similarity index 100% rename from platform/lang-api/src/com/intellij/openapi/module/ModuleConfigurationEditor.java rename to platform/lang-core/src/com/intellij/openapi/module/ModuleConfigurationEditor.java diff --git a/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java b/platform/lang-core/src/com/intellij/openapi/module/ModuleType.java similarity index 100% rename from platform/lang-api/src/com/intellij/openapi/module/ModuleType.java rename to platform/lang-core/src/com/intellij/openapi/module/ModuleType.java diff --git a/platform/lang-api/src/com/intellij/openapi/module/ModuleTypeManager.java b/platform/lang-core/src/com/intellij/openapi/module/ModuleTypeManager.java similarity index 100% rename from platform/lang-api/src/com/intellij/openapi/module/ModuleTypeManager.java rename to platform/lang-core/src/com/intellij/openapi/module/ModuleTypeManager.java diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java b/platform/lang-core/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java similarity index 100% rename from platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java rename to platform/lang-core/src/com/intellij/openapi/roots/ui/configuration/DefaultModulesProvider.java diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/FacetsProvider.java b/platform/lang-core/src/com/intellij/openapi/roots/ui/configuration/FacetsProvider.java similarity index 100% rename from platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/FacetsProvider.java rename to platform/lang-core/src/com/intellij/openapi/roots/ui/configuration/FacetsProvider.java diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationEditorProvider.java b/platform/lang-core/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationEditorProvider.java similarity index 100% rename from platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationEditorProvider.java rename to platform/lang-core/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationEditorProvider.java diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationEditorProviderEx.java b/platform/lang-core/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationEditorProviderEx.java similarity index 100% rename from platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationEditorProviderEx.java rename to platform/lang-core/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationEditorProviderEx.java diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationState.java b/platform/lang-core/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationState.java similarity index 100% rename from platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationState.java rename to platform/lang-core/src/com/intellij/openapi/roots/ui/configuration/ModuleConfigurationState.java diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java b/platform/lang-core/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java similarity index 100% rename from platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java rename to platform/lang-core/src/com/intellij/openapi/roots/ui/configuration/ModulesProvider.java diff --git a/platform/lang-api/src/com/intellij/platform/ProjectTemplate.java b/platform/lang-core/src/com/intellij/platform/ProjectTemplate.java similarity index 100% rename from platform/lang-api/src/com/intellij/platform/ProjectTemplate.java rename to platform/lang-core/src/com/intellij/platform/ProjectTemplate.java diff --git a/platform/vfs-impl/intellij.platform.vfs.impl.iml b/platform/vfs-impl/intellij.platform.vfs.impl.iml index 16d41e74bc5a..c072325fe43c 100644 --- a/platform/vfs-impl/intellij.platform.vfs.impl.iml +++ b/platform/vfs-impl/intellij.platform.vfs.impl.iml @@ -18,7 +18,7 @@ - + \ No newline at end of file