Skip to content

Commit a012d12

Browse files
VISTALLVISTALL
committed
migrate to jspecify
1 parent 126228b commit a012d12

394 files changed

Lines changed: 1127 additions & 2228 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.

‎composite-formatting-string/src/main/java/consulo/dotnet/cfs/ide/completion/CfsCompletionContributor.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import consulo.util.collection.ArrayUtil;
1818
import consulo.util.lang.StringUtil;
1919

20-
import jakarta.annotation.Nonnull;
2120

2221
/**
2322
* @author VISTALL
@@ -31,7 +30,7 @@ public CfsCompletionContributor()
3130
extend(CompletionType.BASIC, StandardPatterns.psiElement().withElementType(CfsTokens.INDEX), new CompletionProvider()
3231
{
3332
@Override
34-
public void addCompletions(@Nonnull CompletionParameters parameters, ProcessingContext context, @Nonnull CompletionResultSet result)
33+
public void addCompletions(CompletionParameters parameters, ProcessingContext context, CompletionResultSet result)
3534
{
3635
int thisArgumentInex = -1;
3736
DotNetExpression[] callArguments = null;
@@ -73,7 +72,6 @@ public void addCompletions(@Nonnull CompletionParameters parameters, ProcessingC
7372
});
7473
}
7574

76-
@Nonnull
7775
@Override
7876
public Language getLanguage()
7977
{

‎composite-formatting-string/src/main/java/consulo/dotnet/cfs/ide/highlight/CfsColorSettingsPage.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
import consulo.language.editor.colorScheme.setting.ColorSettingsPage;
1313
import consulo.language.editor.highlight.SyntaxHighlighter;
1414
import consulo.localize.LocalizeValue;
15-
import jakarta.annotation.Nonnull;
16-
import jakarta.annotation.Nullable;
15+
import org.jspecify.annotations.Nullable;
1716

1817
import java.util.HashMap;
1918
import java.util.Map;
@@ -41,13 +40,11 @@ public class CfsColorSettingsPage implements ColorSettingsPage
4140
}
4241
};
4342

44-
@Nonnull
4543
@Override
4644
public SyntaxHighlighter getHighlighter()
4745
{
4846
return new CfsSyntaxHighlighter(CfsLanguage.INSTANCE.findVersionByClass(IndexCfsLanguageVersion.class))
4947
{
50-
@Nonnull
5148
@Override
5249
public TextAttributesKey[] getTokenHighlights(IElementType elementType)
5350
{
@@ -60,7 +57,6 @@ public TextAttributesKey[] getTokenHighlights(IElementType elementType)
6057
};
6158
}
6259

63-
@Nonnull
6460
@Override
6561
public String getDemoText()
6662
{
@@ -75,14 +71,12 @@ public Map<String, TextAttributesKey> getAdditionalHighlightingTagToDescriptorMa
7571
return myTags;
7672
}
7773

78-
@Nonnull
7974
@Override
8075
public AttributesDescriptor[] getAttributeDescriptors()
8176
{
8277
return myAttributesDescriptors;
8378
}
8479

85-
@Nonnull
8680
@Override
8781
public LocalizeValue getDisplayName()
8882
{

‎composite-formatting-string/src/main/java/consulo/dotnet/cfs/ide/highlight/CfsItemHighlightUsagesHandlerFactory.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
import consulo.util.collection.ArrayUtil;
3737
import consulo.util.lang.ref.SimpleReference;
3838

39-
import jakarta.annotation.Nonnull;
40-
import jakarta.annotation.Nullable;
39+
import org.jspecify.annotations.Nullable;
4140

4241
import java.util.List;
4342

@@ -105,7 +104,7 @@ public HighlightUsagesHandlerBase createHighlightUsagesHandler(Editor editor, Ps
105104
InjectedLanguageManager.getInstance(file.getProject()).enumerate(expression, new PsiLanguageInjectionHost.InjectedPsiVisitor()
106105
{
107106
@Override
108-
public void visit(@Nonnull PsiFile injectedPsi, @Nonnull List<PsiLanguageInjectionHost.Shred> places)
107+
public void visit(PsiFile injectedPsi, List<PsiLanguageInjectionHost.Shred> places)
109108
{
110109
if(injectedPsi instanceof CfsFile)
111110
{
@@ -129,7 +128,7 @@ public void visit(@Nonnull PsiFile injectedPsi, @Nonnull List<PsiLanguageInjecti
129128
}
130129

131130
@RequiredReadAction
132-
public static void addOccurrence(@Nonnull List<TextRange> ranges, @Nonnull PsiElement element)
131+
public static void addOccurrence(List<TextRange> ranges, PsiElement element)
133132
{
134133
TextRange range = element.getTextRange();
135134
if(range != null)

‎composite-formatting-string/src/main/java/consulo/dotnet/cfs/ide/highlight/CfsSyntaxHighlighter.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import consulo.language.editor.highlight.SyntaxHighlighterBase;
2525
import consulo.language.lexer.Lexer;
2626

27-
import jakarta.annotation.Nonnull;
2827
import java.util.HashMap;
2928
import java.util.Map;
3029

@@ -50,14 +49,12 @@ public CfsSyntaxHighlighter(BaseCfsLanguageVersion languageVersion)
5049
myLanguageVersion = languageVersion;
5150
}
5251

53-
@Nonnull
5452
@Override
5553
public Lexer getHighlightingLexer()
5654
{
5755
return myLanguageVersion.createLexer();
5856
}
5957

60-
@Nonnull
6158
@Override
6259
public TextAttributesKey[] getTokenHighlights(IElementType elementType)
6360
{

‎composite-formatting-string/src/main/java/consulo/dotnet/cfs/ide/highlight/CfsSyntaxHighlighterFactory.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import consulo.language.editor.highlight.LanguageVersionableSyntaxHighlighterFactory;
2424
import consulo.language.editor.highlight.SyntaxHighlighter;
2525
import consulo.language.version.LanguageVersion;
26-
import jakarta.annotation.Nonnull;
2726

2827
/**
2928
* @author VISTALL
@@ -32,16 +31,14 @@
3231
@ExtensionImpl
3332
public class CfsSyntaxHighlighterFactory extends LanguageVersionableSyntaxHighlighterFactory
3433
{
35-
@Nonnull
3634
@Override
3735
public Language getLanguage()
3836
{
3937
return CfsLanguage.INSTANCE;
4038
}
4139

42-
@Nonnull
4340
@Override
44-
public SyntaxHighlighter getSyntaxHighlighter(@Nonnull LanguageVersion languageVersion)
41+
public SyntaxHighlighter getSyntaxHighlighter(LanguageVersion languageVersion)
4542
{
4643
return new CfsSyntaxHighlighter((BaseCfsLanguageVersion)languageVersion);
4744
}

‎composite-formatting-string/src/main/java/consulo/dotnet/cfs/lang/BaseCfsLanguageVersion.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import consulo.language.version.LanguageVersion;
2323
import consulo.language.version.LanguageVersionWithParsing;
2424

25-
import jakarta.annotation.Nonnull;
2625

2726
/**
2827
* @author VISTALL
@@ -35,31 +34,26 @@ public BaseCfsLanguageVersion(String name, CfsLanguage language)
3534
super(name, name, language);
3635
}
3736

38-
@Nonnull
3937
@Override
4038
public Lexer createLexer()
4139
{
4240
return new MergingLexerAdapter(createInnerLexer(), TokenSet.create(CfsTokens.TEXT));
4341
}
4442

45-
@Nonnull
4643
public abstract Lexer createInnerLexer();
4744

48-
@Nonnull
4945
@Override
5046
public TokenSet getWhitespaceTokens()
5147
{
5248
return TokenSet.EMPTY;
5349
}
5450

55-
@Nonnull
5651
@Override
5752
public TokenSet getCommentTokens()
5853
{
5954
return TokenSet.EMPTY;
6055
}
6156

62-
@Nonnull
6357
@Override
6458
public TokenSet getStringLiteralElements()
6559
{

‎composite-formatting-string/src/main/java/consulo/dotnet/cfs/lang/BaseExpressionCfsLanguageVersion.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import consulo.language.lexer.Lexer;
2424
import consulo.language.parser.PsiParser;
2525

26-
import jakarta.annotation.Nonnull;
2726

2827
/**
2928
* @author VISTALL
@@ -33,14 +32,13 @@ public abstract class BaseExpressionCfsLanguageVersion extends BaseCfsLanguageVe
3332
{
3433
protected IElementType myExpressionElementType;
3534

36-
public BaseExpressionCfsLanguageVersion(@Nonnull Language baseLanguage)
35+
public BaseExpressionCfsLanguageVersion(Language baseLanguage)
3736
{
3837
super(baseLanguage.getID() + "_EXPRESSION", CfsLanguage.INSTANCE);
3938
}
4039

4140
public abstract IElementType createExpressionElementType();
4241

43-
@Nonnull
4442
@Override
4543
public PsiParser createParser()
4644
{
@@ -51,7 +49,6 @@ public PsiParser createParser()
5149
return new CfsParser(myExpressionElementType);
5250
}
5351

54-
@Nonnull
5552
@Override
5653
public Lexer createInnerLexer()
5754
{

‎composite-formatting-string/src/main/java/consulo/dotnet/cfs/lang/CfsFileType.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import consulo.localize.LocalizeValue;
2222
import consulo.ui.image.Image;
2323

24-
import jakarta.annotation.Nonnull;
2524

2625
/**
2726
* @author VISTALL
@@ -36,28 +35,24 @@ public CfsFileType()
3635
super(CfsLanguage.INSTANCE);
3736
}
3837

39-
@Nonnull
4038
@Override
4139
public String getId()
4240
{
4341
return "CFS";
4442
}
4543

46-
@Nonnull
4744
@Override
4845
public LocalizeValue getDescription()
4946
{
5047
return LocalizeValue.empty();
5148
}
5249

53-
@Nonnull
5450
@Override
5551
public String getDefaultExtension()
5652
{
5753
return "";
5854
}
5955

60-
@Nonnull
6156
@Override
6257
public Image getIcon()
6358
{

‎composite-formatting-string/src/main/java/consulo/dotnet/cfs/lang/CfsLanguage.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import consulo.language.Language;
2020
import consulo.localize.LocalizeValue;
21-
import jakarta.annotation.Nonnull;
2221

2322
/**
2423
* @author VISTALL
@@ -33,7 +32,6 @@ public CfsLanguage()
3332
super("CFS");
3433
}
3534

36-
@Nonnull
3735
@Override
3836
public LocalizeValue getDisplayName()
3937
{

‎composite-formatting-string/src/main/java/consulo/dotnet/cfs/lang/CfsPairedBraceMatcher.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
import consulo.language.PairedBraceMatcher;
2323
import consulo.language.ast.IElementType;
2424
import consulo.language.psi.PsiFile;
25-
import jakarta.annotation.Nonnull;
26-
import jakarta.annotation.Nullable;
25+
import org.jspecify.annotations.Nullable;
2726

2827
/**
2928
* @author VISTALL
@@ -43,7 +42,7 @@ public BracePair[] getPairs()
4342
}
4443

4544
@Override
46-
public boolean isPairedBracesAllowedBeforeType(@Nonnull IElementType elementType, @Nullable IElementType contextElement)
45+
public boolean isPairedBracesAllowedBeforeType(IElementType elementType, @Nullable IElementType contextElement)
4746
{
4847
return contextElement != null && (contextElement == CfsTokens.START || contextElement == CfsTokens.END);
4948
}
@@ -54,7 +53,6 @@ public int getCodeConstructStart(PsiFile file, int i)
5453
return i;
5554
}
5655

57-
@Nonnull
5856
@Override
5957
public Language getLanguage()
6058
{

0 commit comments

Comments
 (0)