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

WEB-70221 WebTemplateNewProjectWizard-based generators misplace the *.iml file

Browse Source 
(cherry picked from commit 7d14bd613239e7c7c65e1a7e387fc6aeff0a8b19)

IJ-CR-149103

GitOrigin-RevId: b1ab392eadc2c263812bc10cd735408326311d2c
This commit is contained in:
Vladimir Panimaskin
2024-12-18 00:25:41 +00:00
committed by intellij-monorepo-bot
parent 70fe60b4c8
commit ea119b9264
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/api-dump-unreviewed.txt
+1 -1
View File
@@ -12883,7 +12883,7 @@ com.intellij.ide.util.projectWizard.WebTemplateProjectWizardData
f:com.intellij.ide.util.projectWizard.WebTemplateProjectWizardData$Companion
- f:getKEY():com.intellij.openapi.util.Key
- f:getWebTemplateData(com.intellij.ide.wizard.NewProjectWizardStep):com.intellij.ide.util.projectWizard.WebTemplateProjectWizardData
f:com.intellij.ide.util.projectWizard.WebTemplateProjectWizardStep
c:com.intellij.ide.util.projectWizard.WebTemplateProjectWizardStep
- com.intellij.ide.wizard.AbstractNewProjectWizardStep
- com.intellij.ide.util.projectWizard.WebTemplateProjectWizardData
- <init>(com.intellij.ide.wizard.NewProjectWizardBaseStep,com.intellij.ide.util.projectWizard.WebProjectTemplate):V
platform/lang-impl/src/com/intellij/ide/util/projectWizard/WebTemplateProjectWizardStep.kt
+9 -4
View File
@@ -1,6 +1,7 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.ide.util.projectWizard
import com.intellij.ide.highlighter.ModuleFileType
import com.intellij.ide.wizard.AbstractNewProjectWizardStep
import com.intellij.ide.wizard.NewProjectWizardBaseStep
import com.intellij.openapi.module.Module
@@ -11,10 +12,11 @@ import com.intellij.platform.ProjectGeneratorPeer
import com.intellij.ui.JBColor
import com.intellij.ui.dsl.builder.AlignX
import com.intellij.ui.dsl.builder.Panel
import java.nio.file.Path
import java.util.function.Consumer
import javax.swing.JLabel
class WebTemplateProjectWizardStep<T>(
open class WebTemplateProjectWizardStep<T>(
val parent: NewProjectWizardBaseStep,
val template: WebProjectTemplate<T>
) : AbstractNewProjectWizardStep(parent), WebTemplateProjectWizardData<T> {
@@ -45,10 +47,13 @@ class WebTemplateProjectWizardStep<T>(
}
private fun webModuleBuilder(): WebModuleBuilder<T> {
val moduleName = parent.name
val projectPath = Path.of(parent.path, moduleName)
return WebModuleBuilder(template, peer).apply {
moduleFilePath = "${parent.path}/${parent.name}"
contentEntryPath = "${parent.path}/${parent.name}"
name = parent.name
contentEntryPath = projectPath.toString()
moduleFilePath = projectPath.resolve(moduleName + ModuleFileType.DOT_DEFAULT_EXTENSION).toString()
name = moduleName
}
}