MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-328027 don't use deprecated ConcurrentIntObjectHashMap in production

Browse Source 
GitOrigin-RevId: 7277f58a08614232c43fe8a131548e5a8f97eda2
This commit is contained in:
Vladimir Krivosheev
2023-08-26 19:27:32 +03:00
committed by intellij-monorepo-bot
parent 6895ac45b8
commit 21c4957bb2
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/code-style-api/intellij.platform.codeStyle.iml
View File

@@ -14,5 +14,6 @@
<orderEntry type="module" module-name="intellij.platform.projectModel" />
<orderEntry type="library" name="kotlin-stdlib" level="project" />
<orderEntry type="module" module-name="intellij.platform.util.jdom" />
<orderEntry type="module" module-name="intellij.platform.concurrency" />
</component>
</module>

6
platform/code-style-api/src/com/intellij/formatting/WrapType.java
View File

@@ -1,9 +1,9 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.formatting;
import com.intellij.concurrency.ConcurrentCollectionFactory;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.IntObjectMap;
/**
@@ -39,7 +39,7 @@ public enum WrapType {
*/
CHOP_DOWN_IF_LONG(CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM);
private static final IntObjectMap<WrapType> LEGACY_MAPPINGS = ContainerUtil.createConcurrentIntObjectMap();
private static final IntObjectMap<WrapType> LEGACY_MAPPINGS = ConcurrentCollectionFactory.createConcurrentIntObjectMap();
static {
for (WrapType wrapType : values()) {

6
platform/code-style-api/src/com/intellij/openapi/editor/GenericLineWrapPositionStrategy.java
View File

@@ -1,9 +1,9 @@
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.openapi.editor;
import com.intellij.concurrency.ConcurrentCollectionFactory;
import com.intellij.openapi.project.Project;
import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.IntObjectMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -24,7 +24,7 @@ public class GenericLineWrapPositionStrategy implements LineWrapPositionStrategy
private static final int NON_ID_WEIGHT = (Rule.DEFAULT_WEIGHT - 1) / 2;
/** Holds symbols wrap rules by symbol. */
private final IntObjectMap<Rule> myRules = ContainerUtil.createConcurrentIntObjectMap();
private final IntObjectMap<Rule> myRules = ConcurrentCollectionFactory.createConcurrentIntObjectMap();
private final Storage myOffset2weight = new Storage();
@Override