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-216902 convert FL/IJVOID/CS/RR/GO to product spec dsl

Browse Source 
GitOrigin-RevId: 8d5a45c95f0fca76bf0915cc3c61e540271de244
This commit is contained in:
Vladimir Krivosheev
2025-11-06 00:29:14 +00:00
committed by intellij-monorepo-bot
parent 69a68a2019
commit d9802c6aa7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaExtensionServiceImpl.java
+3 -3
View File
@@ -1,7 +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.jps.model.java.impl;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.util.text.Strings;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -134,12 +134,12 @@ public class JpsJavaExtensionServiceImpl extends JpsJavaExtensionService {
properties instanceof JavaSourceRootProperties ? ((JavaSourceRootProperties)properties).getPackagePrefix().replace('.', '/') :
properties instanceof JavaResourceRootProperties ? ((JavaResourceRootProperties)properties).getRelativeOutputPath() : "";
var normalizedPrefix = StringUtil.trimStart(prefix, "/");
var normalizedPrefix = Strings.trimStart(prefix, "/");
if (!normalizedPrefix.isEmpty() && !normalizedPrefix.endsWith("/")) {
normalizedPrefix += "/";
}
var normalizedRelativePath = StringUtil.trimStart(relativePath, "/");
var normalizedRelativePath = Strings.trimStart(relativePath, "/");
if (normalizedRelativePath.startsWith(normalizedPrefix)) {
var result = root.getPath().resolve(normalizedRelativePath.substring(normalizedPrefix.length()));
if (Files.exists(result)) {
platform/build-scripts/src/org/jetbrains/intellij/build/ProductProperties.kt
+1 -1
View File
@@ -382,7 +382,7 @@ abstract class ProductProperties {
* @return specification of programmatic content modules, or null to use only XML-based includes
* @see org.jetbrains.intellij.build.productLayout.ProductModulesContentSpec
*/
open fun getProductContentDescriptor(): ProductModulesContentSpec? = null
abstract fun getProductContentDescriptor(): ProductModulesContentSpec?
/**
* @return custom properties for [com.intellij.platform.buildData.productInfo.ProductInfoData].
platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/ProductModulesContentSpec.kt
+2 -2
View File
@@ -160,8 +160,8 @@ class ProductModulesContentSpecBuilder @PublishedApi internal constructor() {
deprecatedXmlIncludes = java.util.List.copyOf(xmlIncludes),
moduleSets = java.util.List.copyOf(moduleSets),
additionalModules = java.util.List.copyOf(additionalModules),
excludedModules = excludedModules,
moduleLoadingOverrides = loadingOverrides,
excludedModules = java.util.Set.copyOf(excludedModules),
moduleLoadingOverrides = java.util.Map.copyOf(loadingOverrides),
)
}
}