Skip to content

Commit a8b7ff6

Browse files
VISTALLVISTALL
committed
migrate to jspecify
1 parent 1fc5c71 commit a8b7ff6

1,058 files changed

Lines changed: 3052 additions & 5696 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎csharp-api/src/main/java/consulo/csharp/compiler/CSharpCompilerProvider.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
import consulo.module.ui.awt.SdkComboBox;
3030
import consulo.virtualFileSystem.VirtualFile;
3131

32-
import jakarta.annotation.Nonnull;
33-
import jakarta.annotation.Nullable;
32+
import org.jspecify.annotations.Nullable;
3433

3534
/**
3635
* @author VISTALL
@@ -42,15 +41,15 @@ public abstract class CSharpCompilerProvider
4241
public static final ExtensionPointName<CSharpCompilerProvider> EP_NAME = ExtensionPointName.create(CSharpCompilerProvider.class);
4342

4443
@Nullable
45-
public abstract SdkType getBundleType(@Nonnull DotNetSimpleModuleExtension<?> moduleExtension);
44+
public abstract SdkType getBundleType(DotNetSimpleModuleExtension<?> moduleExtension);
4645

47-
public void insertCustomSdkItems(@Nullable DotNetSimpleModuleExtension extension, @Nonnull SdkComboBox comboBox)
46+
public void insertCustomSdkItems(@Nullable DotNetSimpleModuleExtension extension, SdkComboBox comboBox)
4847
{
4948
}
5049

51-
public abstract void setupCompiler(@Nonnull DotNetModuleExtension<?> netExtension,
52-
@Nonnull CSharpModuleExtension<?> csharpExtension,
53-
@Nonnull MSBaseDotNetCompilerOptionsBuilder builder,
50+
public abstract void setupCompiler(DotNetModuleExtension<?> netExtension,
51+
CSharpModuleExtension<?> csharpExtension,
52+
MSBaseDotNetCompilerOptionsBuilder builder,
5453
@Nullable VirtualFile compilerSdkHome) throws DotNetCompileFailedException;
5554

5655
protected final void setExecutable(CSharpModuleExtension cSharpModuleExtension, DotNetCompilerOptionsBuilder builder, @Nullable VirtualFile executable) throws DotNetCompileFailedException
@@ -63,7 +62,7 @@ protected final void setExecutable(CSharpModuleExtension cSharpModuleExtension,
6362
cSharpModuleExtension.setCompilerExecutable(builder, executable);
6463
}
6564

66-
public boolean isSelected(@Nonnull DotNetSimpleModuleExtension<?> moduleExtension, @Nonnull String name, @Nullable Sdk sdk)
65+
public boolean isSelected(DotNetSimpleModuleExtension<?> moduleExtension, String name, @Nullable Sdk sdk)
6766
{
6867
return sdk != null && getBundleType(moduleExtension) == sdk.getSdkType();
6968
}

‎csharp-api/src/main/java/consulo/csharp/compiler/MSBaseDotNetCompilerOptionsBuilder.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
import consulo.virtualFileSystem.VirtualFile;
3939
import consulo.virtualFileSystem.VirtualFileManager;
4040

41-
import jakarta.annotation.Nonnull;
42-
import jakarta.annotation.Nullable;
41+
import org.jspecify.annotations.Nullable;
4342
import java.io.File;
4443
import java.nio.file.Files;
4544
import java.util.ArrayList;
@@ -68,13 +67,13 @@ public class MSBaseDotNetCompilerOptionsBuilder implements DotNetCompilerOptions
6867
private final List<String> myArguments = new ArrayList<>();
6968
private final List<String> myProgramArguments = new ArrayList<>();
7069

71-
public MSBaseDotNetCompilerOptionsBuilder addArgument(@Nonnull String arg)
70+
public MSBaseDotNetCompilerOptionsBuilder addArgument(String arg)
7271
{
7372
myArguments.add(arg + "\n");
7473
return this;
7574
}
7675

77-
public MSBaseDotNetCompilerOptionsBuilder addProgramArgument(@Nonnull String arg)
76+
public MSBaseDotNetCompilerOptionsBuilder addProgramArgument(String arg)
7877
{
7978
myProgramArguments.add(arg);
8079
return this;
@@ -126,10 +125,9 @@ else if(matcher.group(4).equals("warning"))
126125
}
127126

128127
@Override
129-
@Nonnull
130-
public GeneralCommandLine createCommandLine(@Nonnull Module module,
131-
@Nonnull VirtualFile[] results,
132-
@Nonnull DotNetModuleExtension<?> extension) throws Exception
128+
public GeneralCommandLine createCommandLine(Module module,
129+
VirtualFile[] results,
130+
DotNetModuleExtension<?> extension) throws Exception
133131
{
134132
if(myExecutable == null)
135133
{
@@ -258,12 +256,12 @@ public String getExecutable()
258256
return myExecutable;
259257
}
260258

261-
public void setExecutable(@Nonnull String executable)
259+
public void setExecutable(String executable)
262260
{
263261
myExecutable = executable;
264262
}
265263

266-
public void setExecutableFromSdk(@Nonnull Sdk sdk, @Nonnull String executableFromSdk)
264+
public void setExecutableFromSdk(Sdk sdk, String executableFromSdk)
267265
{
268266
myExecutable = sdk.getHomePath() + File.separatorChar + executableFromSdk;
269267
}

‎csharp-api/src/main/java/consulo/csharp/module/CSharpLanguageVersionPointer.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import consulo.module.content.layer.ModuleRootLayer;
2525
import consulo.module.content.layer.extension.ModuleInheritableNamedPointerImpl;
2626

27-
import jakarta.annotation.Nonnull;
2827

2928
;
3029

@@ -36,14 +35,14 @@ public class CSharpLanguageVersionPointer extends ModuleInheritableNamedPointerI
3635
{
3736
private final String myExtensionId;
3837

39-
public CSharpLanguageVersionPointer(@Nonnull ModuleRootLayer layer, @Nonnull String id)
38+
public CSharpLanguageVersionPointer(ModuleRootLayer layer, String id)
4039
{
4140
super(layer, "language-version");
4241
myExtensionId = id;
4342
}
4443

4544
@Override
46-
public String getItemNameFromModule(@Nonnull Module module)
45+
public String getItemNameFromModule(Module module)
4746
{
4847
final CSharpSimpleModuleExtension extension = (CSharpSimpleModuleExtension) ModuleUtilCore.getExtension(module, myExtensionId);
4948
if(extension != null)
@@ -54,7 +53,7 @@ public String getItemNameFromModule(@Nonnull Module module)
5453
}
5554

5655
@Override
57-
public CSharpLanguageVersion getItemFromModule(@Nonnull Module module)
56+
public CSharpLanguageVersion getItemFromModule(Module module)
5857
{
5958
final CSharpSimpleModuleExtension extension = (CSharpSimpleModuleExtension) ModuleUtilCore.getExtension(module, myExtensionId);
6059
if(extension != null)
@@ -64,9 +63,8 @@ public CSharpLanguageVersion getItemFromModule(@Nonnull Module module)
6463
return null;
6564
}
6665

67-
@Nonnull
6866
@Override
69-
public NamedPointer<CSharpLanguageVersion> getPointer(@Nonnull ModuleRootLayer layer, @Nonnull String name)
67+
public NamedPointer<CSharpLanguageVersion> getPointer(ModuleRootLayer layer, String name)
7068
{
7169
return CSharpLanguageVersion.valueOf(name);
7270
}

‎csharp-api/src/main/java/consulo/csharp/module/CSharpNullableOption.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import consulo.csharp.api.localize.CSharpLocalize;
2020
import consulo.localize.LocalizeValue;
21-
import jakarta.annotation.Nonnull;
2221

2322
/**
2423
* @author VISTALL
@@ -34,12 +33,11 @@ public enum CSharpNullableOption
3433

3534
private LocalizeValue myDescription;
3635

37-
CSharpNullableOption(@Nonnull LocalizeValue description)
36+
CSharpNullableOption(LocalizeValue description)
3837
{
3938
myDescription = description;
4039
}
4140

42-
@Nonnull
4341
public LocalizeValue getDescription()
4442
{
4543
return myDescription;

‎csharp-api/src/main/java/consulo/csharp/module/extension/CSharpCustomCompilerSdkPointer.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import consulo.module.content.layer.ModuleRootLayer;
2525
import consulo.module.content.layer.extension.ModuleInheritableNamedPointerImpl;
2626

27-
import jakarta.annotation.Nonnull;
2827

2928
/**
3029
* @author VISTALL
@@ -34,14 +33,14 @@ public class CSharpCustomCompilerSdkPointer extends ModuleInheritableNamedPointe
3433
{
3534
private final String myExtensionId;
3635

37-
public CSharpCustomCompilerSdkPointer(@Nonnull ModuleRootLayer layer, @Nonnull String id)
36+
public CSharpCustomCompilerSdkPointer(ModuleRootLayer layer, String id)
3837
{
3938
super(layer, "custom-compiler-sdk");
4039
myExtensionId = id;
4140
}
4241

4342
@Override
44-
public String getItemNameFromModule(@Nonnull Module module)
43+
public String getItemNameFromModule(Module module)
4544
{
4645
final CSharpModuleExtension<?> extension = (CSharpModuleExtension) ModuleUtilCore.getExtension(module, myExtensionId);
4746
if(extension != null)
@@ -52,7 +51,7 @@ public String getItemNameFromModule(@Nonnull Module module)
5251
}
5352

5453
@Override
55-
public Sdk getItemFromModule(@Nonnull Module module)
54+
public Sdk getItemFromModule(Module module)
5655
{
5756
final CSharpModuleExtension<?> extension = (CSharpModuleExtension) ModuleUtilCore.getExtension(module, myExtensionId);
5857
if(extension != null)
@@ -62,9 +61,8 @@ public Sdk getItemFromModule(@Nonnull Module module)
6261
return null;
6362
}
6463

65-
@Nonnull
6664
@Override
67-
public NamedPointer<Sdk> getPointer(@Nonnull ModuleRootLayer layer, @Nonnull String name)
65+
public NamedPointer<Sdk> getPointer(ModuleRootLayer layer, String name)
6866
{
6967
return SdkUtil.createPointer(name);
7068
}

‎csharp-api/src/main/java/consulo/csharp/module/extension/CSharpLanguageVersion.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import consulo.csharp.api.localize.CSharpLocalize;
2222
import consulo.localize.LocalizeValue;
2323

24-
import jakarta.annotation.Nonnull;
2524

2625
/**
2726
* @author VISTALL
@@ -47,17 +46,16 @@ public enum CSharpLanguageVersion implements Named, NamedPointer<CSharpLanguageV
4746

4847
private final LocalizeValue myDescriptionValue;
4948

50-
CSharpLanguageVersion(@Nonnull LocalizeValue descriptionValue)
49+
CSharpLanguageVersion(LocalizeValue descriptionValue)
5150
{
5251
myDescriptionValue = descriptionValue;
5352
}
5453

55-
public boolean isAtLeast(@Nonnull CSharpLanguageVersion languageVersion)
54+
public boolean isAtLeast(CSharpLanguageVersion languageVersion)
5655
{
5756
return ordinal() >= languageVersion.ordinal();
5857
}
5958

60-
@Nonnull
6159
public String getPresentableName()
6260
{
6361
String name = name();
@@ -66,20 +64,17 @@ public String getPresentableName()
6664
return name;
6765
}
6866

69-
@Nonnull
7067
public LocalizeValue getDescriptionValue()
7168
{
7269
return myDescriptionValue;
7370
}
7471

75-
@Nonnull
7672
@Override
7773
public CSharpLanguageVersion get()
7874
{
7975
return this;
8076
}
8177

82-
@Nonnull
8378
@Override
8479
public String getName()
8580
{

‎csharp-api/src/main/java/consulo/csharp/module/extension/CSharpModuleExtension.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
import consulo.module.extension.ModuleInheritableNamedPointer;
2424
import consulo.virtualFileSystem.VirtualFile;
2525

26-
import jakarta.annotation.Nonnull;
27-
import jakarta.annotation.Nullable;
26+
import org.jspecify.annotations.Nullable;
2827

2928
/**
3029
* @author VISTALL
@@ -36,14 +35,12 @@ public interface CSharpModuleExtension<T extends ModuleExtension<T>> extends CSh
3635

3736
boolean isOptimizeCode();
3837

39-
@Nonnull
4038
CSharpPlatform getPlatform();
4139

4240
@Nullable
4341
String getCompilerTarget();
4442

45-
@Nonnull
4643
ModuleInheritableNamedPointer<Sdk> getCustomCompilerSdkPointer();
4744

48-
void setCompilerExecutable(@Nonnull DotNetCompilerOptionsBuilder builder, @Nonnull VirtualFile executable);
45+
void setCompilerExecutable(DotNetCompilerOptionsBuilder builder, VirtualFile executable);
4946
}

‎csharp-api/src/main/java/consulo/csharp/module/extension/CSharpModuleUtil.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@
2020
import consulo.language.psi.PsiElement;
2121
import consulo.language.util.ModuleUtilCore;
2222

23-
import jakarta.annotation.Nonnull;
24-
import jakarta.annotation.Nullable;
23+
import org.jspecify.annotations.Nullable;
2524

2625
/**
2726
* @author VISTALL
2827
* @since 18.05.14
2928
*/
3029
public class CSharpModuleUtil
3130
{
32-
@Nonnull
3331
@RequiredReadAction
3432
public static CSharpLanguageVersion findLanguageVersion(@Nullable PsiElement element)
3533
{

‎csharp-api/src/main/java/consulo/csharp/module/extension/CSharpMutableModuleExtension.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
import consulo.module.content.layer.ModuleRootLayer;
2222
import consulo.module.extension.MutableModuleExtension;
2323
import consulo.module.extension.MutableModuleInheritableNamedPointer;
24-
import jakarta.annotation.Nonnull;
25-
import jakarta.annotation.Nullable;
24+
import org.jspecify.annotations.Nullable;
2625

2726
/**
2827
* @author VISTALL
@@ -33,14 +32,12 @@ public interface CSharpMutableModuleExtension<T extends CSharpModuleExtension<T>
3332
{
3433
void setOptimizeCode(boolean value);
3534

36-
void setPlatform(@Nonnull CSharpPlatform platform);
35+
void setPlatform(CSharpPlatform platform);
3736

3837
void setCompilerTarget(@Nullable String target);
3938

4039
@Override
41-
@Nonnull
4240
MutableModuleInheritableNamedPointer<Sdk> getCustomCompilerSdkPointer();
4341

44-
@Nonnull
4542
ModuleRootLayer getModuleRootLayer();
4643
}

‎csharp-api/src/main/java/consulo/csharp/module/extension/CSharpSimpleModuleExtension.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import consulo.csharp.module.CSharpNullableOption;
2020
import consulo.module.extension.ModuleExtension;
2121

22-
import jakarta.annotation.Nonnull;
2322

2423
/**
2524
* @author VISTALL
@@ -29,12 +28,10 @@ public interface CSharpSimpleModuleExtension<T extends ModuleExtension<T>> exten
2928
{
3029
boolean isAllowUnsafeCode();
3130

32-
@Nonnull
3331
CSharpLanguageVersion getLanguageVersion();
3432

35-
boolean isSupportedLanguageVersion(@Nonnull CSharpLanguageVersion languageVersion);
33+
boolean isSupportedLanguageVersion(CSharpLanguageVersion languageVersion);
3634

37-
@Nonnull
3835
default CSharpNullableOption getNullableOption()
3936
{
4037
return CSharpNullableOption.UNSPECIFIED;

0 commit comments

Comments
 (0)