From 01ae4b58272f91dd636eb46d3f9d31a14769d3a8 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 16 Jul 2025 10:57:27 +0200 Subject: [PATCH] fix nullability - setName expects not-null string GitOrigin-RevId: 880dc9aa1238e789557c24429e1d1856913ddda4 --- platform/lang-impl/api-dump-unreviewed.txt | 1 - platform/lang-impl/api-dump.txt | 5 +++++ .../src/com/intellij/openapi/options/CompoundScheme.java | 6 +++--- platform/lang-impl/src/com/intellij/tools/ToolManager.kt | 9 ++++++--- .../lang-impl/src/com/intellij/tools/ToolsGroup.java | 5 +++-- .../lang-impl/src/com/intellij/tools/ToolsProcessor.java | 4 ++-- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/platform/lang-impl/api-dump-unreviewed.txt b/platform/lang-impl/api-dump-unreviewed.txt index d3989f62c777..b2359ae57133 100644 --- a/platform/lang-impl/api-dump-unreviewed.txt +++ b/platform/lang-impl/api-dump-unreviewed.txt @@ -16551,7 +16551,6 @@ c:com.intellij.tools.ToolEditorDialog f:com.intellij.tools.ToolManager - com.intellij.tools.BaseToolManager - ():V -- s:getInstance():com.intellij.tools.ToolManager f:com.intellij.tools.ToolProcessAdapter - com.intellij.execution.process.ProcessAdapter - (com.intellij.openapi.project.Project,Z,java.lang.String):V diff --git a/platform/lang-impl/api-dump.txt b/platform/lang-impl/api-dump.txt index 3a73091aba18..2a3b2af183b8 100644 --- a/platform/lang-impl/api-dump.txt +++ b/platform/lang-impl/api-dump.txt @@ -1009,6 +1009,11 @@ com.intellij.slicer.SliceLanguageSupportProvider - a:startAnalyzeLeafValues(com.intellij.ide.util.treeView.AbstractTreeStructure,java.lang.Runnable):V - a:startAnalyzeNullness(com.intellij.ide.util.treeView.AbstractTreeStructure,java.lang.Runnable):V - supportValueFilters(com.intellij.psi.PsiElement):Z +f:com.intellij.tools.ToolManager +- sf:Companion:com.intellij.tools.ToolManager$Companion +- sf:getInstance():com.intellij.tools.ToolManager +f:com.intellij.tools.ToolManager$Companion +- f:getInstance():com.intellij.tools.ToolManager com.intellij.unscramble.AnalyzeStacktraceUtil$ConsoleFactory - a:createConsoleComponent(com.intellij.execution.ui.ConsoleView,com.intellij.openapi.actionSystem.DefaultActionGroup):javax.swing.JComponent com.intellij.util.indexing.UnindexedFilesUpdaterListener diff --git a/platform/lang-impl/src/com/intellij/openapi/options/CompoundScheme.java b/platform/lang-impl/src/com/intellij/openapi/options/CompoundScheme.java index 899b117acb29..8175b51a1dee 100644 --- a/platform/lang-impl/src/com/intellij/openapi/options/CompoundScheme.java +++ b/platform/lang-impl/src/com/intellij/openapi/options/CompoundScheme.java @@ -1,4 +1,4 @@ -// 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-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.openapi.options; import com.intellij.openapi.util.NlsSafe; @@ -16,7 +16,7 @@ public class CompoundScheme implements ExternalizableSc protected String myName; protected final ArrayList myElements = new ArrayList<>(); - public CompoundScheme(final String name) { + public CompoundScheme(@NotNull String name) { setName(name); } @@ -37,7 +37,7 @@ public class CompoundScheme implements ExternalizableSc } @Override - public final void setName(final @NotNull String name) { + public final void setName(@NotNull String name) { myName = name; for (E template : myElements) { template.setGroupName(name); diff --git a/platform/lang-impl/src/com/intellij/tools/ToolManager.kt b/platform/lang-impl/src/com/intellij/tools/ToolManager.kt index 41861b82314e..6b957f76e422 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolManager.kt +++ b/platform/lang-impl/src/com/intellij/tools/ToolManager.kt @@ -9,6 +9,7 @@ import com.intellij.openapi.components.service import com.intellij.openapi.options.SchemeManagerFactory import com.intellij.openapi.options.SchemeProcessor import com.intellij.tools.ToolManager.Companion.getInstance +import org.jetbrains.annotations.ApiStatus @Service class ToolManager : BaseToolManager(SchemeManagerFactory.getInstance(), "tools", ToolsBundle.message("tools.settings")) { @@ -17,16 +18,18 @@ class ToolManager : BaseToolManager(SchemeManagerFactory.getInstance(), "t fun getInstance(): ToolManager = service() } - override fun createProcessor(): SchemeProcessor, ToolsGroup> { - return object : ToolsProcessor() { - override fun createToolsGroup(groupName: String?) = ToolsGroup(groupName) + override fun createProcessor(): SchemeProcessor, ToolsGroup> { + return object : ToolsProcessor() { + override fun createToolsGroup(groupName: String) = ToolsGroup(groupName) override fun createTool(): Tool = Tool() } } + @ApiStatus.Internal override fun getActionIdPrefix(): String = Tool.ACTION_ID_PREFIX + @ApiStatus.Internal public override fun getGroupIdPrefix(): String = "Tools_" } diff --git a/platform/lang-impl/src/com/intellij/tools/ToolsGroup.java b/platform/lang-impl/src/com/intellij/tools/ToolsGroup.java index 5f4c04295611..62966905a217 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolsGroup.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolsGroup.java @@ -1,10 +1,11 @@ -// Copyright 2000-2019 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-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.tools; import com.intellij.openapi.options.CompoundScheme; +import org.jetbrains.annotations.NotNull; public final class ToolsGroup extends CompoundScheme { - public ToolsGroup(final String name) { + public ToolsGroup(@NotNull String name) { super(name); } diff --git a/platform/lang-impl/src/com/intellij/tools/ToolsProcessor.java b/platform/lang-impl/src/com/intellij/tools/ToolsProcessor.java index d166a9eccc5a..b5faef23d170 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolsProcessor.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolsProcessor.java @@ -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.tools; @@ -109,7 +109,7 @@ public abstract class ToolsProcessor extends NonLazySchemeProces return Tool.DEFAULT_GROUP_NAME; } - protected abstract ToolsGroup createToolsGroup(String groupName); + protected abstract ToolsGroup createToolsGroup(@NotNull String groupName); protected abstract T createTool();