mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-18 09:34:34 +07:00
IJPL-196468 Added new classpath to the jps module jar
Additionally, properly handle content modules when running from source GitOrigin-RevId: e7a9badcd531785d120901a320f49db36a413c05
This commit is contained in:
committed by
intellij-monorepo-bot
parent
d6e19f87d7
commit
b47056beb9
+2
-2
@@ -1,4 +1,4 @@
|
||||
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
|
||||
// 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.compiler.server.impl
|
||||
|
||||
import com.google.common.collect.HashBiMap
|
||||
@@ -157,7 +157,7 @@ private fun findClassesRoot(relativePath: String, plugin: IdeaPluginDescriptor,
|
||||
if (PluginManagerCore.isRunningFromSources()) {
|
||||
val fileName = FileUtilRt.getNameWithoutExtension(PathUtilRt.getFileName(relativePath))
|
||||
//try restoring module name from JAR name automatically generated by BaseLayout.convertModuleNameToFileName
|
||||
val moduleName = "intellij." + fileName.replace('-', '.')
|
||||
val moduleName = if (relativePath.startsWith("modules/")) fileName else "intellij." + fileName.replace('-', '.')
|
||||
val mapping = PathManager.getArchivedCompiledClassesMapping()
|
||||
if (mapping != null) {
|
||||
// baseFile is ".../idea-compile-parts-v2/production/<module-name>/"
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<tipAndTrick file="InjectSQLLanguage.html"/>
|
||||
<compileServer.plugin classpath="java-langInjection-jps.jar"/>
|
||||
<compileServer.plugin classpath="java-langInjection-jps.jar;modules/intellij.java.langInjection.jps.jar"/>
|
||||
<languageInjectionPerformer language="JAVA"
|
||||
implementationClass="org.intellij.plugins.intelliLang.inject.java.JavaInjectionPerformer"/>
|
||||
</extensions>
|
||||
|
||||
Reference in New Issue
Block a user