diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/AttributedScopeStack.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/AttributedScopeStack.java index fcc108930..c53a9961c 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/AttributedScopeStack.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/AttributedScopeStack.java @@ -34,8 +34,7 @@ final class AttributedScopeStack { record Frame(int encodedTokenAttributes, List scopeNames) { } - @Nullable - static AttributedScopeStack fromExtension(final @Nullable AttributedScopeStack namesScopeList, + static @Nullable AttributedScopeStack fromExtension(final @Nullable AttributedScopeStack namesScopeList, final List contentNameScopesList) { var current = namesScopeList; @Nullable diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/BasicScopeAttributesProvider.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/BasicScopeAttributesProvider.java index d952bb4d4..951f341da 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/BasicScopeAttributesProvider.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/BasicScopeAttributesProvider.java @@ -41,7 +41,7 @@ final class BasicScopeAttributesProvider { private final ConcurrentMap cache = new ConcurrentHashMap<>(); - BasicScopeAttributesProvider(final int initialLanguage, @Nullable final Map embeddedLanguages) { + BasicScopeAttributesProvider(final int initialLanguage, final @Nullable Map embeddedLanguages) { this._defaultAttributes = new BasicScopeAttributes(initialLanguage, OptionalStandardTokenType.NotSet); this._embeddedLanguagesMatcher = new ScopeMatcher<>(defaultIfNull(embeddedLanguages, Collections.emptyMap())); } @@ -50,7 +50,7 @@ BasicScopeAttributes getDefaultAttributes() { return this._defaultAttributes; } - BasicScopeAttributes getBasicScopeAttributes(@Nullable final String scopeName) { + BasicScopeAttributes getBasicScopeAttributes(final @Nullable String scopeName) { if (scopeName == null) { return BasicScopeAttributesProvider._NULL_SCOPE_METADATA; } @@ -92,8 +92,7 @@ private int _scopeToLanguage(final String scopeName) { private static final class ScopeMatcher { private final Map values; - @Nullable - private final Pattern scopesRegExp; + private final @Nullable Pattern scopesRegExp; ScopeMatcher(final Map values) { if (values.isEmpty()) { diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/Grammar.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/Grammar.java index 90de1738d..a8469ffc8 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/Grammar.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/Grammar.java @@ -63,8 +63,7 @@ public final class Grammar implements IGrammar, IRuleFactoryHelper { private final String rootScopeName; - @Nullable - private RuleId _rootId; + private @Nullable RuleId _rootId; private int _lastRuleId = 0; private final Map _ruleId2desc = new HashMap<>(); private final Map includedGrammars = new HashMap<>(); @@ -72,21 +71,19 @@ public final class Grammar implements IGrammar, IRuleFactoryHelper { private final IRawGrammar _grammar; final IThemeProvider themeProvider; - @Nullable - private List _injections; + private @Nullable List _injections; private final BasicScopeAttributesProvider _basicScopeAttributesProvider; private final List _tokenTypeMatchers = new ArrayList<>(); - @Nullable - private final BalancedBracketSelectors balancedBracketSelectors; + private final @Nullable BalancedBracketSelectors balancedBracketSelectors; public Grammar( final String rootScopeName, final IRawGrammar grammar, final int initialLanguage, - @Nullable final Map embeddedLanguages, - @Nullable final Map tokenTypes, - @Nullable final BalancedBracketSelectors balancedBracketSelectors, + final @Nullable Map embeddedLanguages, + final @Nullable Map tokenTypes, + final @Nullable BalancedBracketSelectors balancedBracketSelectors, final IGrammarRepository grammarRepository, final IThemeProvider themeProvider) { @@ -220,8 +217,7 @@ public Rule getRule(final RuleId ruleId) { } @Override - @Nullable - public IRawGrammar getExternalGrammar(final String scopeName, @Nullable final IRawRepository repository) { + public @Nullable IRawGrammar getExternalGrammar(final String scopeName, final @Nullable IRawRepository repository) { if (this.includedGrammars.containsKey(scopeName)) { return this.includedGrammars.get(scopeName); } @@ -236,7 +232,7 @@ public IRawGrammar getExternalGrammar(final String scopeName, @Nullable final IR return null; } - private IRawGrammar initGrammar(IRawGrammar grammar, @Nullable final IRawRule base) { + private IRawGrammar initGrammar(IRawGrammar grammar, final @Nullable IRawRule base) { grammar = ObjectCloner.deepClone(grammar); final var repo = grammar.getRepository(); @@ -254,8 +250,8 @@ public ITokenizeLineResult tokenizeLine(final String lineText) { @Override public ITokenizeLineResult tokenizeLine(final String lineText, - @Nullable final IStateStack prevState, - @Nullable final Duration timeLimit) { + final @Nullable IStateStack prevState, + final @Nullable Duration timeLimit) { return _tokenize(lineText, (StateStack) prevState, false, timeLimit); } @@ -265,8 +261,8 @@ public ITokenizeLineResult tokenizeLine2(final String lineText) { } @Override - public ITokenizeLineResult tokenizeLine2(final String lineText, @Nullable final IStateStack prevState, - @Nullable final Duration timeLimit) { + public ITokenizeLineResult tokenizeLine2(final String lineText, final @Nullable IStateStack prevState, + final @Nullable Duration timeLimit) { return _tokenize(lineText, (StateStack) prevState, true, timeLimit); } @@ -275,7 +271,7 @@ private T _tokenize( String lineText, @Nullable StateStack prevState, final boolean emitBinaryTokens, - @Nullable final Duration timeLimit) { + final @Nullable Duration timeLimit) { var rootId = this._rootId; if (rootId == null) { rootId = this._rootId = RuleFactory.getCompiledRuleId( @@ -358,8 +354,7 @@ private T _tokenize( } @Override - @Nullable - public String getName() { + public @Nullable String getName() { return _grammar.getName(); } diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/LineTokenizer.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/LineTokenizer.java index f1d7c9b66..ad0daf261 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/LineTokenizer.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/LineTokenizer.java @@ -305,8 +305,7 @@ private void scanNext() { } } - @Nullable - private MatchResult matchRule(final Grammar grammar, final OnigString lineText, final boolean isFirstLine, final int linePos, + private @Nullable MatchResult matchRule(final Grammar grammar, final OnigString lineText, final boolean isFirstLine, final int linePos, final StateStack stack, final int anchorPosition) { final var rule = stack.getRule(grammar); final var ruleScanner = rule.compileAG(grammar, stack.endRule, isFirstLine, linePos == anchorPosition); @@ -319,8 +318,7 @@ private MatchResult matchRule(final Grammar grammar, final OnigString lineText, return null; } - @Nullable - private MatchResult matchRuleOrInjections(final Grammar grammar, final OnigString lineText, final boolean isFirstLine, + private @Nullable MatchResult matchRuleOrInjections(final Grammar grammar, final OnigString lineText, final boolean isFirstLine, final int linePos, final StateStack stack, final int anchorPosition) { // Look for normal grammar rule final MatchResult matchResult = matchRule(grammar, lineText, isFirstLine, linePos, stack, anchorPosition); @@ -355,9 +353,8 @@ private MatchResult matchRuleOrInjections(final Grammar grammar, final OnigStrin return matchResult; } - @Nullable - private MatchInjectionsResult matchInjections(final List injections, final Grammar grammar, final OnigString lineText, - final boolean isFirstLine, final int linePos, final StateStack stack, final int anchorPosition) { + private @Nullable MatchInjectionsResult matchInjections(final List injections, final Grammar grammar, + final OnigString lineText, final boolean isFirstLine, final int linePos, final StateStack stack, final int anchorPosition) { // The lower the better var bestMatchRating = Integer.MAX_VALUE; diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/LineTokens.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/LineTokens.java index cce335422..ed76bf49b 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/LineTokens.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/LineTokens.java @@ -105,13 +105,12 @@ public String toString() { private final List _tokenTypeOverrides; - @Nullable - private final BalancedBracketSelectors balancedBracketSelectors; + private final @Nullable BalancedBracketSelectors balancedBracketSelectors; LineTokens(final boolean emitBinaryTokens, final String lineText, final List tokenTypeOverrides, - @Nullable final BalancedBracketSelectors balancedBracketSelectors) { + final @Nullable BalancedBracketSelectors balancedBracketSelectors) { this._emitBinaryTokens = emitBinaryTokens; this._tokenTypeOverrides = tokenTypeOverrides; @@ -130,7 +129,7 @@ void produce(final StateStack stack, final int endIndex) { this.produceFromScopes(stack.contentNameScopesList, endIndex); } - void produceFromScopes(@Nullable final AttributedScopeStack scopesList, final int endIndex) { + void produceFromScopes(final @Nullable AttributedScopeStack scopesList, final int endIndex) { if (this._lastTokenEndIndex >= endIndex) { return; } diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/ScopeStack.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/ScopeStack.java index 2c3131fdb..c3145018f 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/ScopeStack.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/ScopeStack.java @@ -29,8 +29,7 @@ */ public final class ScopeStack { - @Nullable - static ScopeStack push(@Nullable ScopeStack path, final List scopeNames) { + static @Nullable ScopeStack push(@Nullable ScopeStack path, final List scopeNames) { for (final var name : scopeNames) { path = new ScopeStack(path, name); } @@ -41,8 +40,7 @@ public static ScopeStack from(final String first) { return new ScopeStack(null, first); } - @Nullable - public static ScopeStack from(final String... segments) { + public static @Nullable ScopeStack from(final String... segments) { ScopeStack result = null; for (final String segment : segments) { result = new ScopeStack(result, segment); @@ -50,11 +48,10 @@ public static ScopeStack from(final String... segments) { return result; } - @Nullable - public final ScopeStack parent; + public final @Nullable ScopeStack parent; public final String scopeName; - ScopeStack(@Nullable final ScopeStack parent, final String scopeName) { + ScopeStack(final @Nullable ScopeStack parent, final String scopeName) { this.parent = parent; this.scopeName = scopeName; } @@ -92,7 +89,7 @@ public boolean isExtending(final ScopeStack other) { return parent.isExtending(other); } - List getExtensionIfDefined(@Nullable final ScopeStack base) { + List getExtensionIfDefined(final @Nullable ScopeStack base) { final var result = new ArrayList(); @Nullable ScopeStack item = this; diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/StateStack.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/StateStack.java index ca60083c4..fedfa6ec0 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/StateStack.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/StateStack.java @@ -81,8 +81,7 @@ record Frame( /** * The previous state on the stack (or null for the root state). */ - @Nullable - private final StateStack parent; + private final @Nullable StateStack parent; /** * The state (rule) that this element represents. @@ -97,31 +96,28 @@ record Frame( /** * The "pop" (end) condition for this state in case that it was dynamically generated through captured text. */ - @Nullable - final String endRule; + final @Nullable String endRule; /** * The list of scopes containing the "name" for this state. */ - @Nullable - final AttributedScopeStack nameScopesList; + final @Nullable AttributedScopeStack nameScopesList; /** * The list of scopes containing the "contentName" (besides "name") for this state. * This list **must** contain as an element `scopeName`. */ - @Nullable - final AttributedScopeStack contentNameScopesList; + final @Nullable AttributedScopeStack contentNameScopesList; StateStack( - @Nullable final StateStack parent, + final @Nullable StateStack parent, final RuleId ruleId, final int enterPos, final int anchorPos, final boolean beginRuleCapturedEOL, - @Nullable final String endRule, - @Nullable final AttributedScopeStack nameScopesList, - @Nullable final AttributedScopeStack contentNameScopesList) { + final @Nullable String endRule, + final @Nullable AttributedScopeStack nameScopesList, + final @Nullable AttributedScopeStack contentNameScopesList) { this.parent = parent; this.ruleId = ruleId; @@ -135,7 +131,7 @@ record Frame( } @Override - public boolean equals(@Nullable final Object other) { + public boolean equals(final @Nullable Object other) { if (other instanceof final StateStack otherState) { return _equals(this, otherState); } @@ -224,9 +220,9 @@ StateStack push( final int enterPos, final int anchorPos, final boolean beginRuleCapturedEOL, - @Nullable final String endRule, - @Nullable final AttributedScopeStack nameScopesList, - @Nullable final AttributedScopeStack contentNameScopesList) { + final @Nullable String endRule, + final @Nullable AttributedScopeStack nameScopesList, + final @Nullable AttributedScopeStack contentNameScopesList) { return new StateStack( this, ruleId, @@ -324,7 +320,7 @@ Frame toStateStackFrame() { : Collections.emptyList()); } - public static StateStack pushFrame(@Nullable final StateStack self, final Frame frame) { + public static StateStack pushFrame(final @Nullable StateStack self, final Frame frame) { final var namesScopeList = AttributedScopeStack.fromExtension(self == null ? null : self.nameScopesList, frame.nameScopesList); final var enterPos = frame.enterPos; diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/dependencies/ScopeDependencyProcessor.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/dependencies/ScopeDependencyProcessor.java index 0c20bd1f7..ad0d16691 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/dependencies/ScopeDependencyProcessor.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/dependencies/ScopeDependencyProcessor.java @@ -148,15 +148,15 @@ private static class Context { } private static final class ContextWithRepository extends Context { - @Nullable - final IRawRepository repository; - ContextWithRepository(final Context context, @Nullable final IRawRepository repository) { + final @Nullable IRawRepository repository; + + ContextWithRepository(final Context context, final @Nullable IRawRepository repository) { super(context.baseGrammar, context.selfGrammar); this.repository = repository; } - ContextWithRepository(final IRawGrammar baseGrammar, final IRawGrammar selfGrammar, @Nullable final IRawRepository repository) { + ContextWithRepository(final IRawGrammar baseGrammar, final IRawGrammar selfGrammar, final @Nullable IRawRepository repository) { super(baseGrammar, selfGrammar); this.repository = repository; } @@ -227,8 +227,7 @@ private void collectExternalReferencesInRules( break; case TopLevelReference: case TopLevelRepositoryReference: - @Nullable - final IRawGrammar selfGrammar = reference.scopeName.equals(context.selfGrammar.getScopeName()) + final @Nullable IRawGrammar selfGrammar = reference.scopeName.equals(context.selfGrammar.getScopeName()) ? context.selfGrammar : reference.scopeName.equals(context.baseGrammar.getScopeName()) ? context.baseGrammar diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/raw/IRawRepository.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/raw/IRawRepository.java index 2599ef939..14b18f2ce 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/raw/IRawRepository.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/raw/IRawRepository.java @@ -26,7 +26,7 @@ */ public interface IRawRepository { - static IRawRepository merge(@Nullable final IRawRepository... sources) { + static IRawRepository merge(final @Nullable IRawRepository... sources) { final var merged = new RawRepository(); for (final var source : sources) { if (source == null) diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/raw/RawGrammar.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/raw/RawGrammar.java index 229d3f3c4..2ade42021 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/raw/RawGrammar.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/raw/RawGrammar.java @@ -108,7 +108,7 @@ public String getScopeName() { } @Override - public @Nullable Object put(final String key, @Nullable final Object value) { + public @Nullable Object put(final String key, final @Nullable Object value) { if (FILE_TYPES.equals(key)) fileTypes = null; diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/raw/RawRepository.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/raw/RawRepository.java index c5f7dcda3..e3c49e0d6 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/raw/RawRepository.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/raw/RawRepository.java @@ -36,8 +36,7 @@ private IRawRule getOrThrow(final String key) { } @Override - @Nullable - public IRawRule getRule(final String name) { + public @Nullable IRawRule getRule(final String name) { try { return get(name); } catch (final ClassCastException ex) { diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/raw/RawRule.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/raw/RawRule.java index 10f052bd1..1ec7d64b1 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/raw/RawRule.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/raw/RawRule.java @@ -38,9 +38,8 @@ public class RawRule extends PropertySettable.HashMap<@Nullable Object> implemen private static final long serialVersionUID = 1L; - @Nullable @Override - public RuleId getId() { + public @Nullable RuleId getId() { return (RuleId) get(ID); } @@ -49,9 +48,8 @@ public void setId(final RuleId id) { super.put(ID, id); } - @Nullable @Override - public String getName() { + public @Nullable String getName() { return (String) get(NAME); } @@ -60,21 +58,18 @@ public RawRule setName(final String name) { return this; } - @Nullable @Override - public String getContentName() { + public @Nullable String getContentName() { return (String) get(CONTENT_NAME); } - @Nullable @Override - public String getMatch() { + public @Nullable String getMatch() { return (String) get(MATCH); } - @Nullable @Override - public IRawCaptures getCaptures() { + public @Nullable IRawCaptures getCaptures() { updateCaptures(CAPTURES); return (IRawCaptures) get(CAPTURES); } @@ -92,60 +87,52 @@ private void updateCaptures(final String name) { } } - @Nullable @Override - public String getBegin() { + public @Nullable String getBegin() { return (String) get(BEGIN); } - @Nullable @Override - public String getWhile() { + public @Nullable String getWhile() { return (String) get(WHILE); } - @Nullable @Override - public String getInclude() { + public @Nullable String getInclude() { return (String) get(INCLUDE); } - public RawRule setInclude(@Nullable final String include) { + public RawRule setInclude(final @Nullable String include) { super.put(INCLUDE, include); return this; } - @Nullable @Override - public IRawCaptures getBeginCaptures() { + public @Nullable IRawCaptures getBeginCaptures() { updateCaptures(BEGIN_CAPTURES); return (IRawCaptures) get(BEGIN_CAPTURES); } - @Nullable @Override - public String getEnd() { + public @Nullable String getEnd() { return (String) get(END); } - @Nullable @Override - public IRawCaptures getEndCaptures() { + public @Nullable IRawCaptures getEndCaptures() { updateCaptures(END_CAPTURES); return (IRawCaptures) get(END_CAPTURES); } - @Nullable @Override - public IRawCaptures getWhileCaptures() { + public @Nullable IRawCaptures getWhileCaptures() { updateCaptures(WHILE_CAPTURES); return (IRawCaptures) get(WHILE_CAPTURES); } - @Nullable @Override @SuppressWarnings("unchecked") - public Collection getPatterns() { + public @Nullable Collection getPatterns() { return (Collection) get(PATTERNS); } @@ -154,9 +141,8 @@ public RawRule setPatterns(final @Nullable Collection patterns) { return this; } - @Nullable @Override - public IRawRepository getRepository() { + public @Nullable IRawRepository getRepository() { return (IRawRepository) get(REPOSITORY); } diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/tokenattrs/EncodedTokenAttributes.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/tokenattrs/EncodedTokenAttributes.java index 2498da49c..e66b1ee2a 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/tokenattrs/EncodedTokenAttributes.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/grammar/tokenattrs/EncodedTokenAttributes.java @@ -79,7 +79,7 @@ public static int getBackground(final int metadata) { * A value of `0`, `NotSet` or `null` indicates that the corresponding field should be left as is. */ public static int set(final int metadata, final int languageId, final /*OptionalStandardTokenType*/ int tokenType, - @Nullable final Boolean containsBalancedBrackets, final int fontStyle, final int foreground, final int background) { + final @Nullable Boolean containsBalancedBrackets, final int fontStyle, final int foreground, final int background) { final var _languageId = languageId == 0 ? getLanguageId(metadata) : languageId; final var _tokenType = tokenType == OptionalStandardTokenType.NotSet ? getTokenType(metadata) : tokenType; final var _containsBalancedBracketsBit = (containsBalancedBrackets == null diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/matcher/MatcherBuilder.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/matcher/MatcherBuilder.java index 4a9864394..73ebb338c 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/matcher/MatcherBuilder.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/matcher/MatcherBuilder.java @@ -38,8 +38,7 @@ final class MatcherBuilder { private final Tokenizer tokenizer; private final NameMatcher matchesName; - @Nullable - private String token; + private @Nullable String token; MatcherBuilder(final CharSequence selector, final NameMatcher matchesName) { tokenizer = new Tokenizer(selector); @@ -71,8 +70,7 @@ final class MatcherBuilder { } } - @Nullable - private Matcher parseOperand() { + private @Nullable Matcher parseOperand() { if ("-".equals(token)) { token = tokenizer.next(); final var expressionToNegate = parseOperand(); diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/matcher/NameMatcher.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/matcher/NameMatcher.java index d4d446440..670c385e0 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/matcher/NameMatcher.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/matcher/NameMatcher.java @@ -47,7 +47,7 @@ public boolean matches(final Collection identifiers, final List }); } - private boolean scopesAreMatching(@Nullable final String thisScopeName, final String scopeName) { + private boolean scopesAreMatching(final @Nullable String thisScopeName, final String scopeName) { if (thisScopeName == null) { return false; } diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigCaptureIndex.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigCaptureIndex.java index 36d761e69..cd6aa42ed 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigCaptureIndex.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigCaptureIndex.java @@ -35,7 +35,7 @@ public final class OnigCaptureIndex { } @Override - public boolean equals(@Nullable final Object obj) { + public boolean equals(final @Nullable Object obj) { if (this == obj) return true; if (obj instanceof final OnigCaptureIndex other) diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigScanner.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigScanner.java index 2478ee70b..b475ddd0e 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigScanner.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigScanner.java @@ -32,8 +32,7 @@ public OnigScanner(final List regexps) { searcher = new OnigSearcher(regexps); } - @Nullable - public OnigScannerMatch findNextMatch(final OnigString source, final int startPosition) { + public @Nullable OnigScannerMatch findNextMatch(final OnigString source, final int startPosition) { final OnigResult bestResult = searcher.search(source, startPosition); if (bestResult != null) { return new OnigScannerMatch(bestResult, source); diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigScannerMatch.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigScannerMatch.java index 8163cb4e4..4d3ae439c 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigScannerMatch.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/oniguruma/OnigScannerMatch.java @@ -54,7 +54,7 @@ private OnigCaptureIndex[] captureIndicesOfMatch(final OnigResult result, final } @Override - public boolean equals(@Nullable final Object obj) { + public boolean equals(final @Nullable Object obj) { if (this == obj) return true; if (obj instanceof final OnigScannerMatch other) diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/registry/SyncRegistry.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/registry/SyncRegistry.java index 58e2e3784..e875addfd 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/registry/SyncRegistry.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/registry/SyncRegistry.java @@ -58,7 +58,7 @@ public List getColorMap() { /** * Add `grammar` to registry and return a list of referenced scope names */ - public void addGrammar(final IRawGrammar grammar, @Nullable final Collection injectionScopeNames) { + public void addGrammar(final IRawGrammar grammar, final @Nullable Collection injectionScopeNames) { this._rawGrammars.put(grammar.getScopeName(), grammar); if (injectionScopeNames != null) { @@ -82,8 +82,7 @@ public void addGrammar(final IRawGrammar grammar, @Nullable final Collection injections(final String targetScope) { + public @Nullable Collection injections(final String targetScope) { return this._injectionGrammars.get(targetScope); } @@ -98,22 +97,20 @@ public StyleAttributes getDefaults() { /** * Match a scope in the theme. */ - @Nullable @Override - public StyleAttributes themeMatch(final ScopeStack scopePath) { + public @Nullable StyleAttributes themeMatch(final ScopeStack scopePath) { return this._theme.match(scopePath); } /** * Lookup a grammar. */ - @Nullable - public IGrammar grammarForScopeName( + public @Nullable IGrammar grammarForScopeName( final String scopeName, final int initialLanguage, - @Nullable final Map embeddedLanguages, - @Nullable final Map tokenTypes, - @Nullable final BalancedBracketSelectors balancedBracketSelectors) { + final @Nullable Map embeddedLanguages, + final @Nullable Map tokenTypes, + final @Nullable BalancedBracketSelectors balancedBracketSelectors) { return this._grammars.computeIfAbsent(scopeName, scopeName_ -> { final var rawGrammar = lookup(scopeName_); diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/BeginEndRule.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/BeginEndRule.java index 7e344967a..4dca5db7f 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/BeginEndRule.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/BeginEndRule.java @@ -41,11 +41,10 @@ public final class BeginEndRule extends Rule { final boolean hasMissingPatterns; final RuleId[] patterns; - @Nullable - private RegExpSourceList cachedCompiledPatterns; + private @Nullable RegExpSourceList cachedCompiledPatterns; - BeginEndRule(final RuleId id, @Nullable final String name, @Nullable final String contentName, final String begin, - final List<@Nullable CaptureRule> beginCaptures, @Nullable final String end, + BeginEndRule(final RuleId id, final @Nullable String name, final @Nullable String contentName, final String begin, + final List<@Nullable CaptureRule> beginCaptures, final @Nullable String end, final List<@Nullable CaptureRule> endCaptures, final boolean applyEndPatternLast, final CompilePatternsResult patterns) { super(id, name, contentName); @@ -77,17 +76,17 @@ public void collectPatterns(final IRuleRegistry grammar, final RegExpSourceList } @Override - public CompiledRule compile(final IRuleRegistry grammar, @Nullable final String endRegexSource) { + public CompiledRule compile(final IRuleRegistry grammar, final @Nullable String endRegexSource) { return getCachedCompiledPatterns(grammar, endRegexSource).compile(); } @Override - public CompiledRule compileAG(final IRuleRegistry grammar, @Nullable final String endRegexSource, final boolean allowA, + public CompiledRule compileAG(final IRuleRegistry grammar, final @Nullable String endRegexSource, final boolean allowA, final boolean allowG) { return getCachedCompiledPatterns(grammar, endRegexSource).compileAG(allowA, allowG); } - private RegExpSourceList getCachedCompiledPatterns(final IRuleRegistry grammar, @Nullable final String endRegexSource) { + private RegExpSourceList getCachedCompiledPatterns(final IRuleRegistry grammar, final @Nullable String endRegexSource) { var cachedCompiledPatterns = this.cachedCompiledPatterns; if (cachedCompiledPatterns == null) { cachedCompiledPatterns = new RegExpSourceList(); diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/BeginWhileRule.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/BeginWhileRule.java index 5c37c77d9..cd5f9da79 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/BeginWhileRule.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/BeginWhileRule.java @@ -38,13 +38,10 @@ public final class BeginWhileRule extends Rule { final boolean hasMissingPatterns; final RuleId[] patterns; - @Nullable - private RegExpSourceList cachedCompiledPatterns; + private @Nullable RegExpSourceList cachedCompiledPatterns; + private @Nullable RegExpSourceList cachedCompiledWhilePatterns; - @Nullable - private RegExpSourceList cachedCompiledWhilePatterns; - - BeginWhileRule(final RuleId id, @Nullable final String name, @Nullable final String contentName, + BeginWhileRule(final RuleId id, final @Nullable String name, final @Nullable String contentName, final String begin, final List<@Nullable CaptureRule> beginCaptures, final String _while, final List<@Nullable CaptureRule> whileCaptures, final CompilePatternsResult patterns) { @@ -68,12 +65,12 @@ public void collectPatterns(final IRuleRegistry grammar, final RegExpSourceList } @Override - public CompiledRule compile(final IRuleRegistry grammar, @Nullable final String endRegexSource) { + public CompiledRule compile(final IRuleRegistry grammar, final @Nullable String endRegexSource) { return getCachedCompiledPatterns(grammar).compile(); } @Override - public CompiledRule compileAG(final IRuleRegistry grammar, @Nullable final String endRegexSource, + public CompiledRule compileAG(final IRuleRegistry grammar, final @Nullable String endRegexSource, final boolean allowA, final boolean allowG) { return getCachedCompiledPatterns(grammar).compileAG(allowA, allowG); } @@ -92,16 +89,16 @@ private RegExpSourceList getCachedCompiledPatterns(final IRuleRegistry grammar) return cachedCompiledPatterns; } - public CompiledRule compileWhile(@Nullable final String endRegexSource) { + public CompiledRule compileWhile(final @Nullable String endRegexSource) { return getCachedCompiledWhilePatterns(endRegexSource).compile(); } - public CompiledRule compileWhileAG(@Nullable final String endRegexSource, + public CompiledRule compileWhileAG(final @Nullable String endRegexSource, final boolean allowA, final boolean allowG) { return getCachedCompiledWhilePatterns(endRegexSource).compileAG(allowA, allowG); } - private RegExpSourceList getCachedCompiledWhilePatterns(@Nullable final String endRegexSource) { + private RegExpSourceList getCachedCompiledWhilePatterns(final @Nullable String endRegexSource) { var cachedCompiledWhilePatterns = this.cachedCompiledWhilePatterns; if (cachedCompiledWhilePatterns == null) { cachedCompiledWhilePatterns = new RegExpSourceList(); diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/CaptureRule.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/CaptureRule.java index 882462b5f..793b61971 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/CaptureRule.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/CaptureRule.java @@ -27,7 +27,7 @@ public final class CaptureRule extends Rule { public final RuleId retokenizeCapturedWithRuleId; - CaptureRule(final RuleId id, @Nullable final String name, @Nullable final String contentName, + CaptureRule(final RuleId id, final @Nullable String name, final @Nullable String contentName, final RuleId retokenizeCapturedWithRuleId) { super(id, name, contentName); this.retokenizeCapturedWithRuleId = retokenizeCapturedWithRuleId; @@ -39,12 +39,12 @@ public void collectPatterns(final IRuleRegistry grammar, final RegExpSourceList } @Override - public CompiledRule compile(final IRuleRegistry grammar, @Nullable final String endRegexSource) { + public CompiledRule compile(final IRuleRegistry grammar, final @Nullable String endRegexSource) { throw new UnsupportedOperationException(); } @Override - public CompiledRule compileAG(final IRuleRegistry grammar, @Nullable final String endRegexSource, + public CompiledRule compileAG(final IRuleRegistry grammar, final @Nullable String endRegexSource, final boolean allowA, final boolean allowG) { throw new UnsupportedOperationException(); } diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/IncludeOnlyRule.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/IncludeOnlyRule.java index dbe808928..e81ecb033 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/IncludeOnlyRule.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/IncludeOnlyRule.java @@ -28,10 +28,9 @@ final class IncludeOnlyRule extends Rule { final boolean hasMissingPatterns; final RuleId[] patterns; - @Nullable - private RegExpSourceList cachedCompiledPatterns; + private @Nullable RegExpSourceList cachedCompiledPatterns; - IncludeOnlyRule(final RuleId id, @Nullable final String name, @Nullable final String contentName, + IncludeOnlyRule(final RuleId id, final @Nullable String name, final @Nullable String contentName, final CompilePatternsResult patterns) { super(id, name, contentName); this.patterns = patterns.patterns; @@ -47,12 +46,12 @@ public void collectPatterns(final IRuleRegistry grammar, final RegExpSourceList } @Override - public CompiledRule compile(final IRuleRegistry grammar, @Nullable final String endRegexSource) { + public CompiledRule compile(final IRuleRegistry grammar, final @Nullable String endRegexSource) { return getCachedCompiledPatterns(grammar).compile(); } @Override - public CompiledRule compileAG(final IRuleRegistry grammar, @Nullable final String endRegexSource, + public CompiledRule compileAG(final IRuleRegistry grammar, final @Nullable String endRegexSource, final boolean allowA, final boolean allowG) { return getCachedCompiledPatterns(grammar).compileAG(allowA, allowG); } diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/MatchRule.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/MatchRule.java index 81ab7bfb3..714f480a9 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/MatchRule.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/MatchRule.java @@ -30,10 +30,9 @@ public final class MatchRule extends Rule { private final RegExpSource match; public final List<@Nullable CaptureRule> captures; - @Nullable - private RegExpSourceList cachedCompiledPatterns; + private @Nullable RegExpSourceList cachedCompiledPatterns; - MatchRule(final RuleId id, @Nullable final String name, final String match, final List<@Nullable CaptureRule> captures) { + MatchRule(final RuleId id, final @Nullable String name, final String match, final List<@Nullable CaptureRule> captures) { super(id, name, null); this.match = new RegExpSource(match, this.id); this.captures = captures; @@ -45,12 +44,12 @@ public void collectPatterns(final IRuleRegistry grammar, final RegExpSourceList } @Override - public CompiledRule compile(final IRuleRegistry grammar, @Nullable final String endRegexSource) { + public CompiledRule compile(final IRuleRegistry grammar, final @Nullable String endRegexSource) { return getCachedCompiledPatterns(grammar).compile(); } @Override - public CompiledRule compileAG(final IRuleRegistry grammar, @Nullable final String endRegexSource, + public CompiledRule compileAG(final IRuleRegistry grammar, final @Nullable String endRegexSource, final boolean allowA, final boolean allowG) { return getCachedCompiledPatterns(grammar).compileAG(allowA, allowG); } diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/Rule.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/Rule.java index c6fb33181..b598efe36 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/Rule.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/Rule.java @@ -30,15 +30,13 @@ public abstract class Rule { final RuleId id; - @Nullable - private final String name; + private final @Nullable String name; private final boolean nameIsCapturing; - @Nullable - private final String contentName; + private final @Nullable String contentName; private final boolean contentNameIsCapturing; - Rule(final RuleId id, @Nullable final String name, final @Nullable String contentName) { + Rule(final RuleId id, final @Nullable String name, final @Nullable String contentName) { this.id = id; this.name = name; this.nameIsCapturing = RegexSource.hasCaptures(name); @@ -46,8 +44,7 @@ public abstract class Rule { this.contentNameIsCapturing = RegexSource.hasCaptures(contentName); } - @Nullable - public String getName(@Nullable final CharSequence lineText, final OnigCaptureIndex @Nullable [] captureIndices) { + public @Nullable String getName(final @Nullable CharSequence lineText, final OnigCaptureIndex @Nullable [] captureIndices) { final var name = this.name; if (!nameIsCapturing || name == null || lineText == null || captureIndices == null) { return name; @@ -55,8 +52,7 @@ public String getName(@Nullable final CharSequence lineText, final OnigCaptureIn return RegexSource.replaceCaptures(name, lineText, captureIndices); } - @Nullable - public String getContentName(final CharSequence lineText, final OnigCaptureIndex[] captureIndices) { + public @Nullable String getContentName(final CharSequence lineText, final OnigCaptureIndex[] captureIndices) { final var contentName = this.contentName; if (!contentNameIsCapturing || contentName == null) { return contentName; diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/RuleFactory.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/RuleFactory.java index f9ac514d0..e215c49e8 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/RuleFactory.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/RuleFactory.java @@ -41,8 +41,8 @@ public final class RuleFactory { private static final Logger LOGGER = System.getLogger(RuleFactory.class.getName()); - private static CaptureRule createCaptureRule(final IRuleFactoryHelper helper, @Nullable final String name, - @Nullable final String contentName, final RuleId retokenizeCapturedWithRuleId) { + private static CaptureRule createCaptureRule(final IRuleFactoryHelper helper, final @Nullable String name, + final @Nullable String contentName, final RuleId retokenizeCapturedWithRuleId) { return helper.registerRule(id -> new CaptureRule(id, name, contentName, retokenizeCapturedWithRuleId)); } @@ -102,7 +102,7 @@ begin, _compileCaptures(defaultIfNull(desc.getBeginCaptures(), desc.getCaptures( return castNonNull(desc.getId()); } - private static List<@Nullable CaptureRule> _compileCaptures(@Nullable final IRawCaptures captures, final IRuleFactoryHelper helper, + private static List<@Nullable CaptureRule> _compileCaptures(final @Nullable IRawCaptures captures, final IRuleFactoryHelper helper, final IRawRepository repository) { if (captures == null) { return Collections.emptyList(); @@ -142,7 +142,7 @@ private static int parseInt(final String string, final int base) { } } - private static CompilePatternsResult _compilePatterns(@Nullable final Collection patterns, final IRuleFactoryHelper helper, + private static CompilePatternsResult _compilePatterns(final @Nullable Collection patterns, final IRuleFactoryHelper helper, final IRawRepository repository) { if (patterns == null) { return new CompilePatternsResult(new RuleId[0], false); @@ -182,8 +182,7 @@ private static CompilePatternsResult _compilePatterns(@Nullable final Collection if (externalGrammar != null) { final var externalGrammarRepo = externalGrammar.getRepository(); - @Nullable - final String externalGrammarInclude = reference.kind == IncludeReference.Kind.TopLevelRepositoryReference + final @Nullable String externalGrammarInclude = reference.kind == IncludeReference.Kind.TopLevelRepositoryReference ? reference.ruleName : null; if (externalGrammarInclude != null) { diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/RuleId.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/RuleId.java index 2332c5838..c69396403 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/RuleId.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/rule/RuleId.java @@ -51,7 +51,7 @@ private RuleId(final int id) { } @Override - public boolean equals(@Nullable final Object obj) { + public boolean equals(final @Nullable Object obj) { if (this == obj) return true; if (obj instanceof final RuleId other) diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/ColorMap.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/ColorMap.java index 489b38466..786cfe1ca 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/ColorMap.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/ColorMap.java @@ -40,7 +40,7 @@ public ColorMap() { this(null); } - public ColorMap(@Nullable final List _colorMap) { + public ColorMap(final @Nullable List _colorMap) { _id2color.add(""); // required since the upstream impl works with 1-based indexes if (_colorMap != null) { this._isFrozen = true; @@ -77,7 +77,7 @@ public List getColorMap() { } @Override - public boolean equals(@Nullable final Object obj) { + public boolean equals(final @Nullable Object obj) { if (this == obj) return true; if (obj instanceof final ColorMap other) diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/StyleAttributes.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/StyleAttributes.java index 1759a5cdc..ef8ef1db1 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/StyleAttributes.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/StyleAttributes.java @@ -45,7 +45,7 @@ private StyleAttributes(final int fontStyle, final int foregroundId, final int b } @Override - public boolean equals(@Nullable final Object obj) { + public boolean equals(final @Nullable Object obj) { if (this == obj) return true; if (obj instanceof final StyleAttributes other) diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/Theme.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/Theme.java index c52283295..a421f2be0 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/Theme.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/Theme.java @@ -40,7 +40,7 @@ */ public final class Theme { - public static Theme createFromRawTheme(@Nullable final IRawTheme source, @Nullable final List colorMap) { + public static Theme createFromRawTheme(final @Nullable IRawTheme source, final @Nullable List colorMap) { final var theme = createFromParsedTheme(parseTheme(source), colorMap); // custom tm4e code, not from upstream @@ -51,7 +51,7 @@ public static Theme createFromRawTheme(@Nullable final IRawTheme source, @Nullab return theme; } - public static Theme createFromParsedTheme(final List source, @Nullable final List colorMap) { + public static Theme createFromParsedTheme(final List source, final @Nullable List colorMap) { return resolveParsedThemeRules(source, colorMap); } @@ -80,7 +80,7 @@ public Map getEditorColors() { // custom tm4e code, not from ups return editorColors; } - public @Nullable StyleAttributes match(@Nullable final ScopeStack scopePath) { + public @Nullable StyleAttributes match(final @Nullable ScopeStack scopePath) { if (scopePath == null) { return this._defaults; } @@ -150,7 +150,7 @@ private boolean _matchesScope(final String scopeName, final String scopeNamePatt /** * Parse a raw theme into rules. */ - public static List parseTheme(@Nullable final IRawTheme source) { + public static List parseTheme(final @Nullable IRawTheme source) { if (source == null) return Collections.emptyList(); @@ -252,7 +252,7 @@ && isValidHexColor(stringSettingsBackground)) { /** * Resolve rules (i.e. inheritance). */ - public static Theme resolveParsedThemeRules(final List _parsedThemeRules, @Nullable final List _colorMap) { + public static Theme resolveParsedThemeRules(final List _parsedThemeRules, final @Nullable List _colorMap) { // copy the list since we cannot be sure the given list is mutable final var parsedThemeRules = new ArrayList<>(_parsedThemeRules); @@ -305,7 +305,7 @@ public int hashCode() { } @Override - public boolean equals(@Nullable final Object obj) { + public boolean equals(final @Nullable Object obj) { if (this == obj) return true; if (obj instanceof final Theme other) diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/ThemeTrieElement.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/ThemeTrieElement.java index d03dbd9bf..99ca354ca 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/ThemeTrieElement.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/ThemeTrieElement.java @@ -132,7 +132,7 @@ public List match(final String scope) { return rules; } - public void insert(final int scopeDepth, final String scope, @Nullable final List parentScopes, final int fontStyle, + public void insert(final int scopeDepth, final String scope, final @Nullable List parentScopes, final int fontStyle, final int foreground, final int background) { if (scope.isEmpty()) { this.doInsertHere(scopeDepth, parentScopes, fontStyle, foreground, background); @@ -156,7 +156,7 @@ public void insert(final int scopeDepth, final String scope, @Nullable final Lis child.insert(scopeDepth + 1, tail, parentScopes, fontStyle, foreground, background); } - private void doInsertHere(final int scopeDepth, @Nullable final List parentScopes, int fontStyle, int foreground, + private void doInsertHere(final int scopeDepth, final @Nullable List parentScopes, int fontStyle, int foreground, int background) { if (parentScopes == null) { @@ -198,7 +198,7 @@ public int hashCode() { } @Override - public boolean equals(@Nullable final Object obj) { + public boolean equals(final @Nullable Object obj) { if (this == obj) return true; if (obj instanceof final ThemeTrieElement other) diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/utils/MoreCollections.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/utils/MoreCollections.java index c9d403797..12dfd3b79 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/utils/MoreCollections.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/utils/MoreCollections.java @@ -36,8 +36,7 @@ public static List asArrayList(final T firstItem, final List moreItems return list; } - @Nullable - public static T findFirstMatching(final List list, final Predicate filter) { + public static @Nullable T findFirstMatching(final List list, final Predicate filter) { for (final T e : list) { if (filter.test(e)) return e; @@ -48,8 +47,7 @@ public static T findFirstMatching(final List list, final Predicate fil /** * @return the last element or null if list is empty */ - @Nullable - public static T findLastElement(final List list) { + public static @Nullable T findLastElement(final List list) { if (list.isEmpty()) return null; return getLastElement(list); @@ -76,11 +74,11 @@ public static T getLastElement(final List list) { return list.get(list.size() - 1); } - public static Collection nullToEmpty(@Nullable final Collection coll) { + public static Collection nullToEmpty(final @Nullable Collection coll) { return coll == null ? Collections.emptyList() : coll; } - public static List nullToEmpty(@Nullable final List list) { + public static List nullToEmpty(final @Nullable List list) { return list == null ? Collections.emptyList() : list; } diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/utils/ObjectCloner.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/utils/ObjectCloner.java index c01dc3bb2..8a7a9d67d 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/utils/ObjectCloner.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/utils/ObjectCloner.java @@ -82,8 +82,7 @@ public final class ObjectCloner { return obj; } - @Nullable - private static <@Nullable T> T deepCloneNullable(final T obj, final Map clones) { + private static @Nullable <@Nullable T> T deepCloneNullable(final T obj, final Map clones) { if (obj == null) { return null; } diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/utils/RegexSource.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/utils/RegexSource.java index 01eb11741..f8cf0060d 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/utils/RegexSource.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/utils/RegexSource.java @@ -64,7 +64,7 @@ public static String escapeRegExpCharacters(final CharSequence value) { return sb.toString(); } - public static boolean hasCaptures(@Nullable final CharSequence regexSource) { + public static boolean hasCaptures(final @Nullable CharSequence regexSource) { if (regexSource == null) { return false; } diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/utils/StringUtils.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/utils/StringUtils.java index fbdbd39f6..779369387 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/utils/StringUtils.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/utils/StringUtils.java @@ -38,11 +38,11 @@ public final class StringUtils { private static final Pattern RGB = Pattern.compile("^#[0-9a-f]{3}", Pattern.CASE_INSENSITIVE); private static final Pattern RGBA = Pattern.compile("^#[0-9a-f]{4}", Pattern.CASE_INSENSITIVE); - public static String nullToEmpty(@Nullable final String txt) { + public static String nullToEmpty(final @Nullable String txt) { return txt == null ? "" : txt; } - public static boolean isNullOrEmpty(@Nullable final String txt) { + public static boolean isNullOrEmpty(final @Nullable String txt) { return txt == null || txt.isEmpty(); } @@ -156,7 +156,7 @@ public static int strcmp(final String a, final String b) { return 0; } - public static int strArrCmp(@Nullable final List a, @Nullable final List b) { + public static int strArrCmp(final @Nullable List a, final @Nullable List b) { if (a == null && b == null) { return 0; } @@ -188,7 +188,7 @@ public static String substringBefore(final String searchIn, final char searchFor /** * @return "{SimpleClassName}{...fields...}" */ - public static String toString(@Nullable final Object object, final Consumer fieldsBuilder) { + public static String toString(final @Nullable Object object, final Consumer fieldsBuilder) { if (object == null) return "null"; final var sb = new StringBuilder(object.getClass().getSimpleName()); diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/model/Range.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/model/Range.java index 2846f6a8e..618fc5371 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/model/Range.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/model/Range.java @@ -45,7 +45,7 @@ public Range(final int fromLineNumber, final int toLineNumber) { } @Override - public boolean equals(@Nullable final Object obj) { + public boolean equals(final @Nullable Object obj) { if (this == obj) return true; if (obj instanceof final Range other) diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/model/TMTokenizationSupport.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/model/TMTokenizationSupport.java index a34648c0d..927ae7591 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/model/TMTokenizationSupport.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/model/TMTokenizationSupport.java @@ -68,15 +68,15 @@ public IStateStack getInitialState() { } @Override - public TokenizationResult tokenize(final String line, @Nullable final IStateStack state) { + public TokenizationResult tokenize(final String line, final @Nullable IStateStack state) { return tokenize(line, state, null, null); } @Override public TokenizationResult tokenize(final String line, - @Nullable final IStateStack state, - @Nullable final Integer offsetDeltaOrNull, - @Nullable final Duration timeLimit) { + final @Nullable IStateStack state, + final @Nullable Integer offsetDeltaOrNull, + final @Nullable Duration timeLimit) { final int offsetDelta = offsetDeltaOrNull == null ? 0 : offsetDeltaOrNull; final var tokenizationResult = _grammar.tokenizeLine(line, state, timeLimit); diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/IGrammarConfiguration.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/IGrammarConfiguration.java index 652bad49e..5f5ed9410 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/IGrammarConfiguration.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/IGrammarConfiguration.java @@ -29,23 +29,19 @@ */ public interface IGrammarConfiguration { - @Nullable - default Map getEmbeddedLanguages() { + default @Nullable Map getEmbeddedLanguages() { return null; } - @Nullable - default Map getTokenTypes() { + default @Nullable Map getTokenTypes() { return null; } - @Nullable - default List getBalancedBracketSelectors() { + default @Nullable List getBalancedBracketSelectors() { return null; } - @Nullable - default List getUnbalancedBracketSelectors() { + default @Nullable List getUnbalancedBracketSelectors() { return null; } } diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/IGrammarSource.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/IGrammarSource.java index cd4202e19..c29d325ca 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/IGrammarSource.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/IGrammarSource.java @@ -46,7 +46,7 @@ static IGrammarSource fromFile(final Path file) { return fromFile(file, null, null); } - static IGrammarSource fromFile(final Path file, @Nullable final ContentType contentType, @Nullable final Charset charset) { + static IGrammarSource fromFile(final Path file, final @Nullable ContentType contentType, final @Nullable Charset charset) { final var filePath = file.toString(); final var contentType1 = contentType == null ? guessFileFormat(filePath) : contentType; @@ -78,8 +78,8 @@ static IGrammarSource fromResource(final Class clazz, final String resourceNa /** * @throws IllegalArgumentException if the content type is unsupported or cannot be determined */ - static IGrammarSource fromResource(final Class clazz, final String resourceName, @Nullable final ContentType contentType, - @Nullable final Charset charset) { + static IGrammarSource fromResource(final Class clazz, final String resourceName, final @Nullable ContentType contentType, + final @Nullable Charset charset) { final var contentType1 = contentType == null ? guessFileFormat(resourceName) : contentType; return new IGrammarSource() { diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/IRegistryOptions.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/IRegistryOptions.java index eb5d0eb36..3093e4a07 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/IRegistryOptions.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/IRegistryOptions.java @@ -29,23 +29,19 @@ */ public interface IRegistryOptions { - @Nullable - default IRawTheme getTheme() { + default @Nullable IRawTheme getTheme() { return null; } - @Nullable - default List getColorMap() { + default @Nullable List getColorMap() { return null; } - @Nullable - default IGrammarSource getGrammarSource(@SuppressWarnings("unused") final String scopeName) { + default @Nullable IGrammarSource getGrammarSource(@SuppressWarnings("unused") final String scopeName) { return null; } - @Nullable - default Collection getInjections(@SuppressWarnings("unused") final String scopeName) { + default @Nullable Collection getInjections(@SuppressWarnings("unused") final String scopeName) { return null; } } diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/IThemeSource.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/IThemeSource.java index 5e7ad3811..b1c50f9ff 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/IThemeSource.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/IThemeSource.java @@ -46,7 +46,7 @@ static IThemeSource fromFile(final Path file) { return fromFile(file, null, null); } - static IThemeSource fromFile(final Path file, @Nullable final ContentType contentType, @Nullable final Charset charset) { + static IThemeSource fromFile(final Path file, final @Nullable ContentType contentType, final @Nullable Charset charset) { final var filePath = file.toString(); final var contentType1 = contentType == null ? guessFileFormat(filePath) : contentType; @@ -78,8 +78,8 @@ static IThemeSource fromResource(final Class clazz, final String resourceName /** * @throws IllegalArgumentException if the content type is unsupported or cannot be determined */ - static IThemeSource fromResource(final Class clazz, final String resourceName, @Nullable final ContentType contentType, - @Nullable final Charset charset) { + static IThemeSource fromResource(final Class clazz, final String resourceName, final @Nullable ContentType contentType, + final @Nullable Charset charset) { final var contentType1 = contentType == null ? guessFileFormat(resourceName) : contentType; return new IThemeSource() { diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/Registry.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/Registry.java index 5d27f91c0..6dcfe4e7f 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/Registry.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/registry/Registry.java @@ -86,8 +86,7 @@ public List getColorMap() { * Load the grammar for `scopeName` and all referenced included grammars asynchronously. * Please do not use language id 0. */ - @Nullable - public IGrammar loadGrammarWithEmbeddedLanguages( + public @Nullable IGrammar loadGrammarWithEmbeddedLanguages( final String initialScopeName, final int initialLanguage, final Map embeddedLanguages) { @@ -104,8 +103,7 @@ public IGrammar loadGrammarWithEmbeddedLanguages( * Load the grammar for `scopeName` and all referenced included grammars asynchronously. * Please do not use language id 0. */ - @Nullable - public IGrammar loadGrammarWithConfiguration( + public @Nullable IGrammar loadGrammarWithConfiguration( final String initialScopeName, final int initialLanguage, final IGrammarConfiguration configuration) { @@ -122,18 +120,16 @@ public IGrammar loadGrammarWithConfiguration( /** * Load the grammar for `scopeName` and all referenced included grammars. */ - @Nullable - public IGrammar loadGrammar(final String initialScopeName) { + public @Nullable IGrammar loadGrammar(final String initialScopeName) { return this._loadGrammar(initialScopeName, 0, null, null, null); } - @Nullable - private IGrammar _loadGrammar( + private @Nullable IGrammar _loadGrammar( final String initialScopeName, final int initialLanguage, - @Nullable final Map embeddedLanguages, - @Nullable final Map tokenTypes, - @Nullable final BalancedBracketSelectors balancedBracketSelectors) { + final @Nullable Map embeddedLanguages, + final @Nullable Map tokenTypes, + final @Nullable BalancedBracketSelectors balancedBracketSelectors) { if (!_loadSingleGrammar(initialScopeName)) return null; @@ -189,9 +185,9 @@ public IGrammar addGrammar(final IGrammarSource source) throws TMException { public IGrammar addGrammar( final IGrammarSource source, - @Nullable final List injections, - @Nullable final Integer initialLanguage, - @Nullable final Map embeddedLanguages) throws TMException { + final @Nullable List injections, + final @Nullable Integer initialLanguage, + final @Nullable Map embeddedLanguages) throws TMException { try { final var rawGrammar = RawGrammarReader.readGrammar(source); this._syncRegistry.addGrammar(rawGrammar, @@ -208,21 +204,19 @@ public IGrammar addGrammar( /** * Lookup a grammar. The grammar must first be registered via `loadGrammar` or `addGrammar`. */ - @Nullable - public IGrammar grammarForScopeName(final String scopeName) { + public @Nullable IGrammar grammarForScopeName(final String scopeName) { return _grammarForScopeName(scopeName, null, null, null, null); } /** * Get the grammar for `scopeName`. The grammar must first be created via `loadGrammar` or `addGrammar`. */ - @Nullable - private IGrammar _grammarForScopeName( + private @Nullable IGrammar _grammarForScopeName( final String scopeName, - @Nullable final Integer initialLanguage, - @Nullable final Map embeddedLanguages, - @Nullable final Map tokenTypes, - @Nullable final BalancedBracketSelectors balancedBracketSelectors) { + final @Nullable Integer initialLanguage, + final @Nullable Map embeddedLanguages, + final @Nullable Map tokenTypes, + final @Nullable BalancedBracketSelectors balancedBracketSelectors) { return this._syncRegistry.grammarForScopeName( scopeName, initialLanguage == null ? 0 : initialLanguage, diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/theme/css/CSSParser.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/theme/css/CSSParser.java index f51975d2a..4354bd447 100644 --- a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/theme/css/CSSParser.java +++ b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/theme/css/CSSParser.java @@ -64,8 +64,7 @@ public CSSParser(final InputSource source, final Parser parser) throws CSSExcept parser.parseStyleSheet(source); } - @Nullable - public IStyle getBestStyle(final String... cssClassNames) { + public @Nullable IStyle getBestStyle(final String... cssClassNames) { int bestSpecificity = 0; IStyle bestStyle = null; for (final IStyle style : handler.getStyles()) { diff --git a/org.eclipse.tm4e.core/src/test/java/org/eclipse/tm4e/core/grammar/GrammarInjectionTest.java b/org.eclipse.tm4e.core/src/test/java/org/eclipse/tm4e/core/grammar/GrammarInjectionTest.java index 930fe405d..93cbe3781 100644 --- a/org.eclipse.tm4e.core/src/test/java/org/eclipse/tm4e/core/grammar/GrammarInjectionTest.java +++ b/org.eclipse.tm4e.core/src/test/java/org/eclipse/tm4e/core/grammar/GrammarInjectionTest.java @@ -44,9 +44,8 @@ class GrammarInjectionTest { void angular2TokenizeLine() throws Exception { final var registry = new Registry(new IRegistryOptions() { - @Nullable @Override - public Collection getInjections(@Nullable final String scopeName) { + public @Nullable Collection getInjections(final @Nullable String scopeName) { return List.of("template.ng", "styles.ng"); } diff --git a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/LanguageConfigurationPlugin.java b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/LanguageConfigurationPlugin.java index 59f8c2842..df7b2e2fc 100644 --- a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/LanguageConfigurationPlugin.java +++ b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/LanguageConfigurationPlugin.java @@ -50,7 +50,7 @@ public static void logError(final Throwable ex) { log(new Status(IStatus.ERROR, PLUGIN_ID, null, ex)); } - public static void logError(final String message, @Nullable final Throwable ex) { + public static void logError(final String message, final @Nullable Throwable ex) { log(new Status(IStatus.ERROR, PLUGIN_ID, message, ex)); } diff --git a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/HasLanguageConfigurationPropertyTester.java b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/HasLanguageConfigurationPropertyTester.java index 879c9c132..1c094708e 100644 --- a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/HasLanguageConfigurationPropertyTester.java +++ b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/HasLanguageConfigurationPropertyTester.java @@ -22,7 +22,7 @@ public final class HasLanguageConfigurationPropertyTester extends PropertyTester { @Override - public boolean test(@Nullable final Object receiver, final String property, final Object[] args, @Nullable final Object expectedValue) { + public boolean test(final @Nullable Object receiver, final String property, final Object[] args, final @Nullable Object expectedValue) { final var editor = Adapters.adapt(receiver, ITextEditor.class); if (editor == null) { diff --git a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/ToggleLineCommentHandler.java b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/ToggleLineCommentHandler.java index 44fde9cbf..01aa26cbc 100644 --- a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/ToggleLineCommentHandler.java +++ b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/ToggleLineCommentHandler.java @@ -47,12 +47,12 @@ public class ToggleLineCommentHandler extends AbstractHandler { public static final String ADD_BLOCK_COMMENT_COMMAND_ID = "org.eclipse.tm4e.languageconfiguration.addBlockCommentCommand"; public static final String REMOVE_BLOCK_COMMENT_COMMAND_ID = "org.eclipse.tm4e.languageconfiguration.removeBlockCommentCommand"; - private static @Nullable T adapt(@Nullable final Object sourceObject, final Class adapter) { + private static @Nullable T adapt(final @Nullable Object sourceObject, final Class adapter) { return Adapters.adapt(sourceObject, adapter); } @Override - public @Nullable Object execute(@Nullable final ExecutionEvent event) throws ExecutionException { + public @Nullable Object execute(final @Nullable ExecutionEvent event) throws ExecutionException { if (event == null) { return null; } diff --git a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/preferences/LanguageConfigurationPreferencePage.java b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/preferences/LanguageConfigurationPreferencePage.java index 34bc9cce9..1a4feb4c7 100644 --- a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/preferences/LanguageConfigurationPreferencePage.java +++ b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/preferences/LanguageConfigurationPreferencePage.java @@ -101,7 +101,7 @@ protected void createColumns() { } @Override - protected Object[] getElements(@Nullable final Object input) { + protected Object[] getElements(final @Nullable Object input) { if (input instanceof final ILanguageConfigurationRegistryManager manager) return manager.getDefinitions(); return super.getElements(input); diff --git a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/registry/AbstractLanguageConfigurationRegistryManager.java b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/registry/AbstractLanguageConfigurationRegistryManager.java index 3360f82bb..90b1280f5 100644 --- a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/registry/AbstractLanguageConfigurationRegistryManager.java +++ b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/registry/AbstractLanguageConfigurationRegistryManager.java @@ -40,9 +40,8 @@ void unregisterLanguageConfigurationDefinition(final ILanguageConfigurationDefin (definition.getPluginId() == null ? userDefinitions : pluginDefinitions).remove(definition.getContentType()); } - @Nullable @Override - public LanguageConfiguration getLanguageConfigurationFor(final IContentType... contentTypes) { + public @Nullable LanguageConfiguration getLanguageConfigurationFor(final IContentType... contentTypes) { for (final IContentType contentType : contentTypes) { final var userDefinition = userDefinitions.get(contentType); if (userDefinition != null) { diff --git a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/supports/CommentSupport.java b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/supports/CommentSupport.java index 8e855bab8..1186f10ed 100644 --- a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/supports/CommentSupport.java +++ b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/supports/CommentSupport.java @@ -21,7 +21,7 @@ public final class CommentSupport { private final @Nullable CommentRule comments; - public CommentSupport(@Nullable final CommentRule comments) { + public CommentSupport(final @Nullable CommentRule comments) { this.comments = comments; } diff --git a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/wizards/SelectLanguageConfigurationWizardPage.java b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/wizards/SelectLanguageConfigurationWizardPage.java index b425f5c7c..b8fdccc70 100644 --- a/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/wizards/SelectLanguageConfigurationWizardPage.java +++ b/org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/wizards/SelectLanguageConfigurationWizardPage.java @@ -202,7 +202,7 @@ private void createContentTypeTreeViewer(final Composite composite) { private static final class ContentTypesLabelProvider extends LabelProvider { @Override - public @Nullable String getText(@Nullable final Object element) { + public @Nullable String getText(final @Nullable Object element) { return element == null ? "" : ((IContentType) element).getName(); @@ -214,7 +214,7 @@ private static final class ContentTypesContentProvider implements ITreeContentPr private IContentTypeManager manager = Platform.getContentTypeManager(); @Override - public Object[] getChildren(@Nullable final Object parentElement) { + public Object[] getChildren(final @Nullable Object parentElement) { final var elements = new ArrayList<>(); final var baseType = (IContentType) parentElement; for (final var contentType : manager.getAllContentTypes()) { @@ -226,7 +226,7 @@ public Object[] getChildren(@Nullable final Object parentElement) { } @Override - public @Nullable Object getParent(@Nullable final Object element) { + public @Nullable Object getParent(final @Nullable Object element) { if (element == null) return null; final IContentType contentType = (IContentType) element; @@ -234,17 +234,17 @@ public Object[] getChildren(@Nullable final Object parentElement) { } @Override - public boolean hasChildren(@Nullable final Object element) { + public boolean hasChildren(final @Nullable Object element) { return getChildren(element).length > 0; } @Override - public Object[] getElements(@Nullable final Object inputElement) { + public Object[] getElements(final @Nullable Object inputElement) { return getChildren(manager.getContentType(IContentTypeManager.CT_TEXT)); } @Override - public void inputChanged(final Viewer viewer, @Nullable final Object oldInput, @Nullable final Object newInput) { + public void inputChanged(final Viewer viewer, final @Nullable Object oldInput, final @Nullable Object newInput) { manager = newInput == null ? Platform.getContentTypeManager() : (IContentTypeManager) newInput; } } @@ -259,8 +259,7 @@ private Text createText(final Composite parent, final String s) { return text; } - @Nullable - private IStatus validatePage() { + private @Nullable IStatus validatePage() { infoWidget.refresh(null); final String path = fileText.getText(); diff --git a/org.eclipse.tm4e.languageconfiguration/src/test/java/org/eclipse/tm4e/languageconfiguration/internal/model/ParsingTest.java b/org.eclipse.tm4e.languageconfiguration/src/test/java/org/eclipse/tm4e/languageconfiguration/internal/model/ParsingTest.java index 3eb25c503..2b05bdc66 100644 --- a/org.eclipse.tm4e.languageconfiguration/src/test/java/org/eclipse/tm4e/languageconfiguration/internal/model/ParsingTest.java +++ b/org.eclipse.tm4e.languageconfiguration/src/test/java/org/eclipse/tm4e/languageconfiguration/internal/model/ParsingTest.java @@ -28,8 +28,7 @@ class ParsingTest { - @Nullable - private LanguageConfiguration loadLanguageConfiguration(final String path) throws IOException { + private @Nullable LanguageConfiguration loadLanguageConfiguration(final String path) throws IOException { try (InputStream is = getClass().getResourceAsStream(path)) { assertNotNull(is); return LanguageConfiguration.load(new InputStreamReader(is)); diff --git a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/TMHTMLRenderer.java b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/TMHTMLRenderer.java index 5a404a2cb..3eead7c75 100644 --- a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/TMHTMLRenderer.java +++ b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/TMHTMLRenderer.java @@ -32,7 +32,7 @@ public TMHTMLRenderer(final String defaultLang) { } @Override - public void code(final String code, @Nullable final String lang, final boolean escaped) { + public void code(final String code, final @Nullable String lang, final boolean escaped) { final IGrammar grammar = lang == null ? getDefaultGrammar() : getGrammar(lang); if (grammar == null) { super.code(code, lang, escaped); @@ -62,9 +62,8 @@ private void emitNewLine() { html.append("
"); } - @Nullable - private IStateStack tokenizeLine(final String line, final ITokenizationSupport tokenizationSupport, - @Nullable final IStateStack startState) { + private @Nullable IStateStack tokenizeLine(final String line, final ITokenizationSupport tokenizationSupport, + final @Nullable IStateStack startState) { final var tokenized = tokenizationSupport.tokenize(line, startState); final var endState = tokenized.getEndState(); final var tokens = tokenized.getTokens(); @@ -103,13 +102,11 @@ private IStateStack tokenizeLine(final String line, final ITokenizationSupport t return endState; } - @Nullable - protected IGrammar getDefaultGrammar() { + protected @Nullable IGrammar getDefaultGrammar() { return getGrammar(defaultLang); } - @Nullable - protected IGrammar getGrammar(final String lang) { + protected @Nullable IGrammar getGrammar(final String lang) { final IContentType[] contentTypes = Platform.getContentTypeManager().findContentTypesFor("x." + lang); return TMEclipseRegistryPlugin.getGrammarRegistryManager().getGrammarFor(contentTypes); } diff --git a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/HTMLRenderer.java b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/HTMLRenderer.java index 1f1b7390e..14ef5fa87 100644 --- a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/HTMLRenderer.java +++ b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/HTMLRenderer.java @@ -33,7 +33,7 @@ public HTMLRenderer(final StringBuilder html) { } @Override - public void code(final String code, @Nullable final String lang, final boolean escaped) { + public void code(final String code, final @Nullable String lang, final boolean escaped) { if (lang == null) { html.append("
");
 			html.append(escaped ? code : htmlEscape(code, true));
diff --git a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/InlineLexer.java b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/InlineLexer.java
index 2e16c1f09..16aafa44b 100644
--- a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/InlineLexer.java
+++ b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/InlineLexer.java
@@ -29,7 +29,7 @@ public class InlineLexer {
 	private final InlineRules rules;
 	private final IRenderer renderer;
 
-	public InlineLexer(@Nullable final Object links, @Nullable final Options options, @Nullable final IRenderer renderer) {
+	public InlineLexer(final @Nullable Object links, final @Nullable Options options, final @Nullable IRenderer renderer) {
 		this.options = options != null ? options : Options.DEFAULTS;
 		// this.links = links;
 		this.renderer = renderer != null ? renderer : new HTMLRenderer();
diff --git a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Lexer.java b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Lexer.java
index 1209d37db..d441d84f2 100644
--- a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Lexer.java
+++ b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Lexer.java
@@ -27,7 +27,7 @@ public class Lexer {
 	private final Tokens tokens;
 	private final Options options;
 
-	public Lexer(@Nullable final Options options) {
+	public Lexer(final @Nullable Options options) {
 		this.tokens = new Tokens();
 		this.options = options != null ? options : Options.DEFAULTS;
 
@@ -42,7 +42,7 @@ public Lexer(@Nullable final Options options) {
 		}
 	}
 
-	public static Tokens lex(final String src, @Nullable final Options options) {
+	public static Tokens lex(final String src, final @Nullable Options options) {
 		final var lexer = new Lexer(options);
 		return lexer.lex(src);
 	}
@@ -59,7 +59,7 @@ private Tokens token(final String src, final boolean top) {
 		return token(src, top, null);
 	}
 
-	private Tokens token(String src, final boolean top, @Nullable final Object bq) {
+	private Tokens token(String src, final boolean top, final @Nullable Object bq) {
 		src = src.replaceAll("^ +$", "");
 		Matcher cap;
 		while (!StringUtils.isNullOrEmpty(src)) {
diff --git a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Marked.java b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Marked.java
index 571661ff5..44573debf 100644
--- a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Marked.java
+++ b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Marked.java
@@ -28,11 +28,11 @@ public static IRenderer parse(final String src, final IRenderer renderer) {
 		return parse(src, null, renderer);
 	}
 
-	public static IRenderer parse(final String src, @Nullable final Options opt) {
+	public static IRenderer parse(final String src, final @Nullable Options opt) {
 		return parse(src, opt, null);
 	}
 
-	public static IRenderer parse(final String src, @Nullable final Options opt, @Nullable final IRenderer renderer) {
+	public static IRenderer parse(final String src, final @Nullable Options opt, final @Nullable IRenderer renderer) {
 		return Parser.parse(Lexer.lex(src, opt), opt, renderer);
 	}
 
diff --git a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Parser.java b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Parser.java
index 222f6dd87..f2000e8b6 100644
--- a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Parser.java
+++ b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Parser.java
@@ -24,16 +24,15 @@ public class Parser {
 	private final Options options;
 	private final IRenderer renderer;
 
-	@Nullable
-	private Token token;
+	private @Nullable Token token;
 
-	public Parser(@Nullable final Options options, @Nullable final IRenderer renderer) {
+	public Parser(final @Nullable Options options, final @Nullable IRenderer renderer) {
 		this.options = options != null ? options : Options.DEFAULTS;
 		this.renderer = renderer != null ? renderer : new HTMLRenderer();
 	}
 
-	public static IRenderer parse(final Tokens src, @Nullable final Options options,
-			@Nullable final IRenderer renderer) {
+	public static IRenderer parse(final Tokens src, final @Nullable Options options,
+			final @Nullable IRenderer renderer) {
 		final var parser = new Parser(options, renderer);
 		return parser.parse(src);
 	}
diff --git a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/RegExp.java b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/RegExp.java
index ed37f49e7..765f6423c 100644
--- a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/RegExp.java
+++ b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/RegExp.java
@@ -26,7 +26,7 @@ public class RegExp {
 	protected @Nullable String source;
 	private @Nullable Pattern pattern;
 
-	public RegExp(@Nullable final String source) {
+	public RegExp(final @Nullable String source) {
 		this.source = source;
 	}
 
@@ -52,7 +52,7 @@ public RegExp replace(final String name, final RegExp val) {
 		return replace(name, val.source);
 	}
 
-	public RegExp replace(@Nullable final String name, @Nullable String val) {
+	public RegExp replace(final @Nullable String name, @Nullable String val) {
 		if (name == null)
 			return new RegExp(source);
 
@@ -68,7 +68,7 @@ public RegExp replaceAll(final String name, final RegExp val) {
 		return replaceAll(name, val.source);
 	}
 
-	public RegExp replaceAll(@Nullable final String name, @Nullable String val) {
+	public RegExp replaceAll(final @Nullable String name, @Nullable String val) {
 		if (name == null)
 			return new RegExp(source);
 
diff --git a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Token.java b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Token.java
index 8dad861f9..3c1eb8b83 100644
--- a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Token.java
+++ b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Token.java
@@ -21,24 +21,20 @@
 public class Token {
 
 	public final TokenType type;
-
-	@Nullable
-	public final String text;
+	public final @Nullable String text;
 	public final int depth;
-
-	@Nullable
-	public final String lang;
+	public final @Nullable String lang;
 	public final boolean escaped;
 
 	public Token(final TokenType type) {
 		this(type, null);
 	}
 
-	public Token(final TokenType type, @Nullable final String text) {
+	public Token(final TokenType type, final @Nullable String text) {
 		this(type, text, -1);
 	}
 
-	public Token(final TokenType type, @Nullable final String text, final int depth) {
+	public Token(final TokenType type, final @Nullable String text, final int depth) {
 		this(type, text, depth, null, false);
 	}
 
@@ -46,7 +42,7 @@ public Token(final TokenType type, final String lang, final String text) {
 		this(type, text, -1, lang, false);
 	}
 
-	private Token(final TokenType type, @Nullable final String text, final int depth, @Nullable final String lang,
+	private Token(final TokenType type, final @Nullable String text, final int depth, final @Nullable String lang,
 			final boolean escaped) {
 		this.type = type;
 		this.text = text;
diff --git a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Tokens.java b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Tokens.java
index efc20e6e8..e0b14946b 100644
--- a/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Tokens.java
+++ b/org.eclipse.tm4e.markdown/src/main/java/org/eclipse/tm4e/markdown/marked/Tokens.java
@@ -25,16 +25,14 @@ public class Tokens extends ArrayList {
 
 	private static final long serialVersionUID = 1L;
 
-	@Nullable
-	public Object links;
+	public @Nullable Object links;
 
 	public Tokens reverse() {
 		Collections.reverse(this);
 		return this;
 	}
 
-	@Nullable
-	public Token pop() {
+	public @Nullable Token pop() {
 		if (super.isEmpty()) {
 			return null;
 		}
diff --git a/org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/TMEclipseRegistryPlugin.java b/org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/TMEclipseRegistryPlugin.java
index 0579b9e62..1baece5fe 100644
--- a/org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/TMEclipseRegistryPlugin.java
+++ b/org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/TMEclipseRegistryPlugin.java
@@ -53,7 +53,7 @@ public static void logError(final Throwable ex) {
 		log(new Status(IStatus.ERROR, PLUGIN_ID, ex.getMessage(), ex));
 	}
 
-	public static void logError(final String message, @Nullable final Throwable ex) {
+	public static void logError(final String message, final @Nullable Throwable ex) {
 		log(new Status(IStatus.ERROR, PLUGIN_ID, message, ex));
 	}
 
diff --git a/org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/internal/TMScope.java b/org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/internal/TMScope.java
index e225b1a8c..5dc9e1f90 100644
--- a/org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/internal/TMScope.java
+++ b/org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/internal/TMScope.java
@@ -43,7 +43,7 @@ public TMScope(String scopeName, @Nullable String pluginId) {
 		qualifiedName = pluginId == null ? scopeName : scopeName + CONTRIBUTOR_SEPARATOR + pluginId;
 	}
 
-	private TMScope(final String scopeName, @Nullable final String pluginId, final String qualifiedName) {
+	private TMScope(final String scopeName, final @Nullable String pluginId, final String qualifiedName) {
 		this.name = scopeName;
 		this.pluginId = pluginId;
 		this.qualifiedName = qualifiedName;
diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/TMUIPlugin.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/TMUIPlugin.java
index 6bacb9b1c..aaead1d1e 100644
--- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/TMUIPlugin.java
+++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/TMUIPlugin.java
@@ -47,8 +47,7 @@ public class TMUIPlugin extends AbstractUIPlugin {
 	 *
 	 * @return the shared instance
 	 */
-	@Nullable
-	public static TMUIPlugin getDefault() {
+	public static @Nullable TMUIPlugin getDefault() {
 		return plugin;
 	}
 
@@ -114,7 +113,7 @@ public void start(final BundleContext context) throws Exception {
 			tm4eCoreLogger.setLevel(Level.FINEST);
 			tm4eCoreLogger.addHandler(new Handler() {
 				@Override
-				public void publish(@Nullable final LogRecord entry) {
+				public void publish(final @Nullable LogRecord entry) {
 					if (entry == null)
 						return;
 
diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/TMPropertyTester.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/TMPropertyTester.java
index 711ee4a86..cc73523b6 100644
--- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/TMPropertyTester.java
+++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/TMPropertyTester.java
@@ -25,7 +25,7 @@ public final class TMPropertyTester extends PropertyTester {
 	private static final String CAN_SUPPORT_TEXT_MATE = "canSupportTextMate";
 
 	@Override
-	public boolean test(@Nullable final Object receiver, final String property, final Object[] args, @Nullable final Object expectedValue) {
+	public boolean test(final @Nullable Object receiver, final String property, final Object[] args, final @Nullable Object expectedValue) {
 		if (CAN_SUPPORT_TEXT_MATE.equals(property) && receiver instanceof final IEditorPart editorPart) {
 			final var reconciler = TMPresentationReconciler.getTMPresentationReconciler(editorPart);
 			return reconciler != null && reconciler.isEnabled();
diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/text/TMPresentationReconcilerTestGenerator.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/text/TMPresentationReconcilerTestGenerator.java
index 7d6c5d158..b46e2a0ec 100644
--- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/text/TMPresentationReconcilerTestGenerator.java
+++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/text/TMPresentationReconcilerTestGenerator.java
@@ -153,7 +153,7 @@ public void onUninstalled() {
 	}
 
 	@Override
-	public void onColorized(final TextPresentation presentation, @Nullable final Throwable e) {
+	public void onColorized(final TextPresentation presentation, final @Nullable Throwable e) {
 		// Command command = commands.get(commands.size() - 1);
 		// if (e != null) {
 		// command.error = e;
diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/utils/ContentTypeHelper.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/utils/ContentTypeHelper.java
index 877179036..1368d2533 100644
--- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/utils/ContentTypeHelper.java
+++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/utils/ContentTypeHelper.java
@@ -51,8 +51,7 @@ public final class ContentTypeHelper {
 	 *
 	 * @return the content types from the given {@link IDocument} and null otherwise.
 	 */
-	@Nullable
-	public static ContentTypeInfo findContentTypes(final IDocument document) {
+	public static @Nullable ContentTypeInfo findContentTypes(final IDocument document) {
 		// Find content types from FileBuffers
 		final ContentTypeInfo contentTypes = findContentTypesFromFileBuffers(document);
 		if (contentTypes != null) {
@@ -69,8 +68,7 @@ public static ContentTypeInfo findContentTypes(final IDocument document) {
 	 *
 	 * @return matching content type or null
 	 */
-	@Nullable
-	public static IContentType getContentTypeById(final String contentTypeId) {
+	public static @Nullable IContentType getContentTypeById(final String contentTypeId) {
 		final IContentTypeManager manager = Platform.getContentTypeManager();
 		return manager.getContentType(contentTypeId);
 	}
@@ -86,8 +84,7 @@ public static IContentType getContentTypeById(final String contentTypeId) {
 	 * @return the content types from the given {@link IDocument} by using
 	 *         {@link ITextFileBufferManager} and null otherwise.
 	 */
-	@Nullable
-	private static ContentTypeInfo findContentTypesFromFileBuffers(final IDocument document) {
+	private static @Nullable ContentTypeInfo findContentTypesFromFileBuffers(final IDocument document) {
 		final ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
 		final ITextFileBuffer buffer = bufferManager.getTextFileBuffer(document);
 		if (buffer != null) {
@@ -103,8 +100,7 @@ private static ContentTypeInfo findContentTypesFromFileBuffers(final IDocument d
 	 *
 	 * @return the content types from the given {@link ITextFileBuffer}.
 	 */
-	@Nullable
-	private static ContentTypeInfo getContentTypes(final ITextFileBuffer buffer) {
+	private static @Nullable ContentTypeInfo getContentTypes(final ITextFileBuffer buffer) {
 		try {
 			final String fileName = buffer.getFileStore().getName();
 			final var contentTypes = new LinkedHashSet();
@@ -179,8 +175,7 @@ private static InputStream getContents(final ITextFileBuffer buffer) throws Core
 	 * @return the content types from the given {@link IDocument} by using
 	 *         {@link IEditorInput} and null otherwise.
 	 */
-	@Nullable
-	private static ContentTypeInfo findContentTypesFromEditorInput(final IDocument document) {
+	private static @Nullable ContentTypeInfo findContentTypesFromEditorInput(final IDocument document) {
 		final IEditorInput editorInput = getEditorInput(document);
 		if (editorInput != null) {
 			if (editorInput instanceof final IStorageEditorInput storageInput) {
@@ -209,8 +204,7 @@ private static ContentTypeInfo findContentTypesFromEditorInput(final IDocument d
 	 *
 	 * @return the {@link IEditorInput} from the given document and null otherwise.
 	 */
-	@Nullable
-	private static IEditorInput getEditorInput(final IDocument document) {
+	private static @Nullable IEditorInput getEditorInput(final IDocument document) {
 		try {
 			// This utilities class is very ugly, I have not found a clean mean
 			// to retrieve the IEditorInput linked to a document.
diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/GrammarDefinitionLabelProvider.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/GrammarDefinitionLabelProvider.java
index aef99bfa4..f29218ca8 100644
--- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/GrammarDefinitionLabelProvider.java
+++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/GrammarDefinitionLabelProvider.java
@@ -21,21 +21,19 @@
  * Label provider for grammar definition.
  */
 public final class GrammarDefinitionLabelProvider extends LabelProvider implements ITableLabelProvider {
-	@Nullable
+
 	@Override
-	public Image getColumnImage(@Nullable final Object element, final int columnIndex) {
+	public @Nullable Image getColumnImage(final @Nullable Object element, final int columnIndex) {
 		return null;
 	}
 
-	@Nullable
 	@Override
-	public String getText(@Nullable final Object element) {
+	public @Nullable String getText(final @Nullable Object element) {
 		return getColumnText(element, 0);
 	}
 
-	@Nullable
 	@Override
-	public String getColumnText(@Nullable final Object element, final int columnIndex) {
+	public @Nullable String getColumnText(final @Nullable Object element, final int columnIndex) {
 		if (element == null)
 			return "";
 
diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/GrammarInfoWidget.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/GrammarInfoWidget.java
index 39097ff56..fd73f3b94 100644
--- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/GrammarInfoWidget.java
+++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/GrammarInfoWidget.java
@@ -71,7 +71,7 @@ public GrammarInfoWidget(final Composite parent, final int style) {
 		fileTypesText.setLayoutData(GridDataFactory.fillDefaults().hint(100, SWT.DEFAULT).create());
 	}
 
-	public void refresh(@Nullable final IGrammar grammar) {
+	public void refresh(final @Nullable IGrammar grammar) {
 		if (grammar == null) {
 			nameText.setText("");
 			scopeNameText.setText("");
diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/ThemeAssociationsWidget.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/ThemeAssociationsWidget.java
index 3dfd9621e..5e925ebba 100644
--- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/ThemeAssociationsWidget.java
+++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/ThemeAssociationsWidget.java
@@ -75,7 +75,7 @@ protected void createColumns() {
 			}
 
 			@Override
-			protected Object[] getElements(@Nullable final Object input) {
+			protected Object[] getElements(final @Nullable Object input) {
 				if (input instanceof final IGrammarDefinition grammarDef) {
 					return themeManager
 							.getThemeAssociationsForScope(grammarDef.getScope().getName());
diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/ThemeLabelProvider.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/ThemeLabelProvider.java
index 2fbec36e7..b57666775 100644
--- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/ThemeLabelProvider.java
+++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/ThemeLabelProvider.java
@@ -22,24 +22,21 @@
  */
 public final class ThemeLabelProvider extends LabelProvider implements ITableLabelProvider {
 
-	@Nullable
 	@Override
-	public Image getColumnImage(@Nullable final Object element, final int columnIndex) {
+	public @Nullable Image getColumnImage(final @Nullable Object element, final int columnIndex) {
 		return null;
 	}
 
-	@Nullable
 	@Override
-	public String getText(@Nullable final Object element) {
+	public @Nullable String getText(final @Nullable Object element) {
 		if (element == null)
 			return "";
 		final ITheme theme = (ITheme) element;
 		return theme.getName();
 	}
 
-	@Nullable
 	@Override
-	public String getColumnText(@Nullable final Object element, final int columnIndex) {
+	public @Nullable String getColumnText(final @Nullable Object element, final int columnIndex) {
 		if (element == null)
 			return "";
 		final ITheme theme = (ITheme) element;
diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/wizards/CreateThemeAssociationWizard.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/wizards/CreateThemeAssociationWizard.java
index 30eee3e3b..705bb9333 100644
--- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/wizards/CreateThemeAssociationWizard.java
+++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/wizards/CreateThemeAssociationWizard.java
@@ -61,16 +61,15 @@ public boolean performFinish() {
 		return true;
 	}
 
-	@Nullable
-	public IThemeAssociation getCreatedThemeAssociation() {
+	public @Nullable IThemeAssociation getCreatedThemeAssociation() {
 		return createdThemeAssociation;
 	}
 
-	public void setInitialDefinition(@Nullable final IGrammarDefinition definition) {
+	public void setInitialDefinition(final @Nullable IGrammarDefinition definition) {
 		this.initialDefinition = definition;
 	}
 
-	public void setInitialAssociation(@Nullable final IThemeAssociation association) {
+	public void setInitialAssociation(final @Nullable IThemeAssociation association) {
 		this.initialAssociation = association;
 	}
 }
diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/wizards/CreateThemeAssociationWizardPage.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/wizards/CreateThemeAssociationWizardPage.java
index 37e7f0a34..00a7df703 100644
--- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/wizards/CreateThemeAssociationWizardPage.java
+++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/wizards/CreateThemeAssociationWizardPage.java
@@ -46,16 +46,13 @@ final class CreateThemeAssociationWizardPage extends AbstractWizardPage {
 	private ComboViewer themeViewer = lateNonNull();
 	private ComboViewer grammarsCombo = lateNonNull();
 
-	@Nullable
-	private final IGrammarDefinition initialDefinition;
-
-	@Nullable
-	private final IThemeAssociation initialAssociation;
+	private final @Nullable IGrammarDefinition initialDefinition;
+	private final @Nullable IThemeAssociation initialAssociation;
 
 	private Button whenDarkButton = lateNonNull();
 
-	protected CreateThemeAssociationWizardPage(@Nullable final IGrammarDefinition initialDefinition,
-			@Nullable final IThemeAssociation initialAssociation) {
+	protected CreateThemeAssociationWizardPage(final @Nullable IGrammarDefinition initialDefinition,
+			final @Nullable IThemeAssociation initialAssociation) {
 		super(PAGE_NAME);
 		super.setTitle(TMUIMessages.CreateThemeAssociationWizardPage_title);
 		super.setDescription(TMUIMessages.CreateThemeAssociationWizardPage_description);
@@ -114,9 +111,8 @@ protected void initializeDefaultValues() {
 		setPageComplete(false);
 	}
 
-	@Nullable
 	@Override
-	protected IStatus validatePage(final Event event) {
+	protected @Nullable IStatus validatePage(final Event event) {
 		if (themeViewer.getSelection().isEmpty()) {
 			return new Status(IStatus.ERROR, TMUIPlugin.PLUGIN_ID,
 					TMUIMessages.CreateThemeAssociationWizardPage_theme_error_required);
diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/wizards/SelectGrammarWizardPage.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/wizards/SelectGrammarWizardPage.java
index c426fdf5a..0bb8b6d0a 100644
--- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/wizards/SelectGrammarWizardPage.java
+++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/wizards/SelectGrammarWizardPage.java
@@ -185,9 +185,8 @@ protected void initializeDefaultValues() {
 		setPageComplete(false);
 	}
 
-	@Nullable
 	@Override
-	protected IStatus validatePage(final Event event) {
+	protected @Nullable IStatus validatePage(final Event event) {
 		grammarInfoWidget.refresh(null);
 		final String path = grammarFileText.getText();
 		if (path.isEmpty()) {
diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/themes/Theme.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/themes/Theme.java
index 05e385577..c3f04322f 100644
--- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/themes/Theme.java
+++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/themes/Theme.java
@@ -99,45 +99,40 @@ public IToken getToken(final String textMateTokenType) {
 				: themeColor;
 	}
 
-	@Nullable
 	@Override
-	public Color getEditorForeground() {
+	public @Nullable Color getEditorForeground() {
 		final ITokenProvider provider = getTokenProvider();
 		return getPriorityColor(
 				provider != null ? provider.getEditorForeground() : null,
 				AbstractTextEditor.PREFERENCE_COLOR_FOREGROUND);
 	}
 
-	@Nullable
 	@Override
-	public Color getEditorBackground() {
+	public @Nullable Color getEditorBackground() {
 		final ITokenProvider provider = getTokenProvider();
 		return getPriorityColor(
 				provider != null ? provider.getEditorBackground() : null,
 				AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND);
 	}
 
-	@Nullable
 	@Override
-	public Color getEditorSelectionForeground() {
+	public @Nullable Color getEditorSelectionForeground() {
 		final ITokenProvider provider = getTokenProvider();
 		return getPriorityColor(
 				provider != null ? provider.getEditorSelectionForeground() : null,
 				AbstractTextEditor.PREFERENCE_COLOR_SELECTION_FOREGROUND);
 	}
 
-	@Nullable
 	@Override
-	public Color getEditorSelectionBackground() {
+	public @Nullable Color getEditorSelectionBackground() {
 		final ITokenProvider provider = getTokenProvider();
 		return getPriorityColor(
 				provider != null ? provider.getEditorSelectionBackground() : null,
 				AbstractTextEditor.PREFERENCE_COLOR_SELECTION_BACKGROUND);
 	}
 
-	@Nullable
 	@Override
-	public Color getEditorCurrentLineHighlight() {
+	public @Nullable Color getEditorCurrentLineHighlight() {
 		final ITokenProvider provider = getTokenProvider();
 		final Color themeColor = provider != null ? provider.getEditorCurrentLineHighlight() : null;
 		final ColorManager manager = ColorManager.getInstance();
@@ -146,8 +141,7 @@ public Color getEditorCurrentLineHighlight() {
 				: themeColor;
 	}
 
-	@Nullable
-	private ITokenProvider getTokenProvider() {
+	private @Nullable ITokenProvider getTokenProvider() {
 		if (tokenProvider == null || isModified()) {
 			try (InputStream in = getInputStream()) {
 				final var path = getPath();
diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/themes/ThemeAssociation.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/themes/ThemeAssociation.java
index 6c3324b25..f2e144d97 100644
--- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/themes/ThemeAssociation.java
+++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/themes/ThemeAssociation.java
@@ -28,14 +28,9 @@ public final class ThemeAssociation implements IThemeAssociation {
 	private static final String WHEN_DARK_ATTR = "whenDark"; //$NON-NLS-1$
 
 	private final String themeId;
-
-	@Nullable
-	private String scopeName;
-
+	private @Nullable String scopeName;
 	private boolean whenDark;
-
-	@Nullable
-	private String pluginId;
+	private @Nullable String pluginId;
 
 	/**
 	 * Constructor for user preferences (loaded from Json with Gson).
@@ -60,9 +55,8 @@ public ThemeAssociation(final IConfigurationElement ce) {
 		this.pluginId = ce.getNamespaceIdentifier();
 	}
 
-	@Nullable
 	@Override
-	public String getPluginId() {
+	public @Nullable String getPluginId() {
 		return pluginId;
 	}
 
@@ -71,9 +65,8 @@ public String getThemeId() {
 		return themeId;
 	}
 
-	@Nullable
 	@Override
-	public String getScopeName() {
+	public @Nullable String getScopeName() {
 		return scopeName;
 	}
 
@@ -101,5 +94,4 @@ public boolean equals(final @Nullable Object obj) {
 					&& Objects.equals(themeId, other.themeId);
 		return false;
 	}
-
 }