platform: @NotNull

GitOrigin-RevId: f8f5cd9acfef7aabc459a3cbe54eb5cab9998fae
This commit is contained in:
Aleksey Pivovarov
2025-03-13 11:53:39 +01:00
committed by intellij-monorepo-bot
parent d19213df34
commit 55bdb12ba1
16 changed files with 24 additions and 22 deletions

View File

@@ -161,7 +161,7 @@ public interface Configurable extends UnnamedConfigurable {
*/
@FunctionalInterface
interface Composite {
Configurable @NotNull [] getConfigurables();
@NotNull Configurable @NotNull [] getConfigurables();
}
/**

View File

@@ -67,13 +67,13 @@ public interface SearchableConfigurable extends ConfigurableWithId {
}
@Override
public final Configurable @NotNull [] getConfigurables() {
public final @NotNull Configurable @NotNull [] getConfigurables() {
if (myKids != null) return myKids;
myKids = buildConfigurables();
return myKids;
}
protected abstract Configurable[] buildConfigurables();
protected abstract @NotNull Configurable @NotNull [] buildConfigurables();
}
}

View File

@@ -170,7 +170,7 @@ public final class CodeStyleSchemesConfigurable extends SearchableConfigurable.P
}
@Override
protected Configurable[] buildConfigurables() {
protected @NotNull Configurable @NotNull [] buildConfigurables() {
CodeStyleGroupProviderFactory groupProviderFactory = new CodeStyleGroupProviderFactory(getModel(), this);
myPanels = new ArrayList<>();

View File

@@ -35,7 +35,7 @@ public final class CodeStyleGroupProvider extends CodeStyleSettingsProvider {
mySchemesConfigurable = configurable;
}
public Configurable createConfigurable() {
public @NotNull Configurable createConfigurable() {
return new CodeStyleGroupConfigurable();
}
@@ -102,7 +102,7 @@ public final class CodeStyleGroupProvider extends CodeStyleSettingsProvider {
}
@Override
public Configurable @NotNull [] buildConfigurables() {
public @NotNull Configurable @NotNull [] buildConfigurables() {
List<Configurable> childConfigurables = new ArrayList<>();
for (CodeStyleSettingsProvider childProvider : myChildProviders) {
CodeStyleConfigurableWrapper wrapper =

View File

@@ -58,8 +58,8 @@ import org.jetbrains.annotations.*;
import javax.swing.*;
import java.awt.*;
import java.nio.file.Path;
import java.util.List;
import java.util.*;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
@@ -485,7 +485,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract
}
@Override
public Configurable @NotNull [] buildConfigurables() {
public @NotNull Configurable @NotNull [] buildConfigurables() {
myDisposeCompleted = false;
initAll();

View File

@@ -306,13 +306,13 @@ public class ConfigurableWrapper implements SearchableConfigurable, Weighted, Hi
}
@Override
public Configurable @NotNull [] getConfigurables() {
public @NotNull Configurable @NotNull [] getConfigurables() {
if (isInitialized) {
return myKids;
}
long time = System.currentTimeMillis();
ArrayList<Configurable> list = new ArrayList<>();
ArrayList<@NotNull Configurable> list = new ArrayList<>();
if (super.myEp.dynamic) {
Composite composite = cast(Composite.class, this);
if (composite != null) {

View File

@@ -22,7 +22,7 @@ public class SortedConfigurableGroup
private final String myHelpTopic;
int myWeight; // see ConfigurableExtensionPointUtil.getConfigurableToReplace
List<Configurable> myList = new ArrayList<>();
List<@NotNull Configurable> myList = new ArrayList<>();
public SortedConfigurableGroup(@NonNls @NotNull String id,
@NlsContexts.ConfigurableName @NotNull String displayName,
@@ -37,7 +37,7 @@ public class SortedConfigurableGroup
}
@Override
protected Configurable[] buildConfigurables() {
protected @NotNull Configurable @NotNull [] buildConfigurables() {
myList.sort(COMPARATOR);
Configurable[] result = myList.toArray(new Configurable[0]);
myList.clear();

View File

@@ -76,7 +76,7 @@ public final class VcsManagerConfigurable extends SearchableConfigurable.Parent.
}
@Override
protected Configurable[] buildConfigurables() {
protected @NotNull Configurable @NotNull [] buildConfigurables() {
List<Configurable> result = new ArrayList<>();
result.add(new VcsGeneralSettingsConfigurable(myProject));

View File

@@ -17,7 +17,7 @@ import java.util.List;
abstract class SubCompositeConfigurable implements SearchableConfigurable.Parent, SearchableConfigurable.Merged {
protected DataViewsConfigurableUi root;
protected Configurable[] children;
protected @NotNull Configurable[] children;
protected JComponent rootComponent;
@Override

View File

@@ -340,7 +340,7 @@ public final class InjectionsSettingsUI extends SearchableConfigurable.Parent.Ab
}
@Override
protected Configurable[] buildConfigurables() {
protected @NotNull Configurable @NotNull [] buildConfigurables() {
final ArrayList<Configurable> configurables = new ArrayList<>();
for (LanguageInjectionSupport support : InjectorUtils.getActiveInjectionSupports()) {
ContainerUtil.addAll(configurables, support.createSettings(myProject, myConfiguration));

View File

@@ -82,7 +82,7 @@ public class CopyrightFormattingConfigurable extends SearchableConfigurable.Pare
}
@Override
protected Configurable[] buildConfigurables() {
protected @NotNull Configurable @NotNull [] buildConfigurables() {
final FileType[] types = FileTypeUtil.getSupportedTypes().toArray(FileType.EMPTY_ARRAY);
final Configurable[] children = new Configurable[types.length];
Arrays.sort(types, new FileTypeUtil.SortByName());

View File

@@ -78,7 +78,7 @@ public class CopyrightProjectConfigurable extends SearchableConfigurable.Parent.
}
@Override
protected Configurable[] buildConfigurables() {
protected @NotNull Configurable @NotNull [] buildConfigurables() {
return new Configurable[]{myProfilesPanel, new CopyrightFormattingConfigurable(project)};
}

View File

@@ -9,13 +9,14 @@ import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
public final class FileTypeCopyrightConfigurableFactory {
private FileTypeCopyrightConfigurableFactory() {
}
public static Configurable createFileTypeConfigurable(Project project, FileType fileType, TemplateCommentPanel parentPanel) {
public static @NotNull Configurable createFileTypeConfigurable(Project project, FileType fileType, TemplateCommentPanel parentPanel) {
if (fileType.equals(StdFileTypes.JAVA)) {
return new TemplateCommentPanel(fileType, parentPanel, project,
CopyrightBundle.message("radio.location.in.file.before.package"),

View File

@@ -118,7 +118,7 @@ public class PyContentEntriesModuleConfigurable extends SearchableConfigurable.P
}
@Override
protected Configurable[] buildConfigurables() {
protected @NotNull Configurable @NotNull [] buildConfigurables() {
return new Configurable[0];
}

View File

@@ -53,7 +53,7 @@ public final class PyConsoleOptionsConfigurable extends SearchableConfigurable.P
}
@Override
protected Configurable[] buildConfigurables() {
protected @NotNull Configurable @NotNull [] buildConfigurables() {
List<Configurable> result = new ArrayList<>();
PyConsoleSpecificOptionsPanel pythonConsoleOptionsPanel = new PyConsoleSpecificOptionsPanel(myProject);

View File

@@ -27,7 +27,8 @@ public class EmmetCompositeConfigurable extends SearchableConfigurable.Parent.Ab
this(Collections.emptyList(), innerConfigurables);
}
public EmmetCompositeConfigurable(Collection<Configurable> nestedConfigurables, Configurable @NotNull ... innerConfigurables) {
public EmmetCompositeConfigurable(@NotNull Collection<@NotNull Configurable> nestedConfigurables,
Configurable @NotNull ... innerConfigurables) {
myNestedConfigurables = nestedConfigurables.toArray(new Configurable[0]);
myInnerConfigurables = innerConfigurables;
myTemplateExpandShortcutPanel = new TemplateExpandShortcutPanel(XmlBundle.message("emmet.expand.abbreviation.with"));
@@ -116,7 +117,7 @@ public class EmmetCompositeConfigurable extends SearchableConfigurable.Parent.Ab
}
@Override
protected Configurable[] buildConfigurables() {
protected @NotNull Configurable @NotNull [] buildConfigurables() {
return myNestedConfigurables;
}
}