Skip to content

Commit 72ab1d6

Browse files
Remove KAPT
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
1 parent ecb4a99 commit 72ab1d6

24 files changed

Lines changed: 85 additions & 109 deletions

app/src/main/java/third_parties/io/noties/prism4j/languages/MarkwonGrammarLocator.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77

88
package third_parties.io.noties.prism4j.languages;
99

10-
import org.jetbrains.annotations.NotNull;
11-
import org.jetbrains.annotations.Nullable;
12-
1310
import java.util.HashMap;
1411
import java.util.HashSet;
1512
import java.util.List;
1613
import java.util.Map;
1714
import java.util.Set;
1815

16+
import androidx.annotation.NonNull;
17+
import androidx.annotation.Nullable;
1918
import io.noties.prism4j.GrammarLocator;
2019
import io.noties.prism4j.Prism4j;
2120

@@ -24,13 +23,13 @@ public class MarkwonGrammarLocator implements GrammarLocator {
2423
@SuppressWarnings("ConstantConditions")
2524
private static final Prism4j.Grammar NULL =
2625
new Prism4j.Grammar() {
27-
@NotNull
26+
@NonNull
2827
@Override
2928
public String name() {
3029
return null;
3130
}
3231

33-
@NotNull
32+
@NonNull
3433
@Override
3534
public List<Prism4j.Token> tokens() {
3635
return null;
@@ -41,7 +40,7 @@ public List<Prism4j.Token> tokens() {
4140

4241
@Nullable
4342
@Override
44-
public Prism4j.Grammar grammar(@NotNull Prism4j prism4j, @NotNull String language) {
43+
public Prism4j.Grammar grammar(@NonNull Prism4j prism4j, @NonNull String language) {
4544

4645
final String name = realLanguageName(language);
4746

@@ -64,8 +63,8 @@ public Prism4j.Grammar grammar(@NotNull Prism4j prism4j, @NotNull String languag
6463
return grammar;
6564
}
6665

67-
@NotNull
68-
protected String realLanguageName(@NotNull String name) {
66+
@NonNull
67+
protected String realLanguageName(@NonNull String name) {
6968
final String out;
7069
switch (name) {
7170
case "dotnet":
@@ -90,7 +89,7 @@ protected String realLanguageName(@NotNull String name) {
9089
}
9190

9291
@Nullable
93-
protected Prism4j.Grammar obtainGrammar(@NotNull Prism4j prism4j, @NotNull String name) {
92+
protected Prism4j.Grammar obtainGrammar(@NonNull Prism4j prism4j, @NonNull String name) {
9493
final Prism4j.Grammar grammar;
9594
switch (name) {
9695
case "c":
@@ -168,7 +167,7 @@ protected Prism4j.Grammar obtainGrammar(@NotNull Prism4j prism4j, @NotNull Strin
168167
return grammar;
169168
}
170169

171-
protected void triggerModify(@NotNull Prism4j prism4j, @NotNull String name) {
170+
protected void triggerModify(@NonNull Prism4j prism4j, @NonNull String name) {
172171
switch (name) {
173172
case "markup":
174173
prism4j.grammar("css");
@@ -178,7 +177,7 @@ protected void triggerModify(@NotNull Prism4j prism4j, @NotNull String name) {
178177
}
179178

180179
@Override
181-
@NotNull
180+
@NonNull
182181
public Set<String> languages() {
183182
final Set<String> set = new HashSet<String>(23);
184183
set.add("c");

app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_c.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
package third_parties.io.noties.prism4j.languages;
99

10-
import org.jetbrains.annotations.NotNull;
11-
10+
import androidx.annotation.NonNull;
1211
import io.noties.prism4j.GrammarUtils;
1312
import io.noties.prism4j.Prism4j;
1413
import io.noties.prism4j.annotations.Extend;
@@ -24,15 +23,15 @@
2423
@Extend("clike")
2524
public class Prism_c {
2625

27-
@NotNull
28-
public static Prism4j.Grammar create(@NotNull Prism4j prism4j) {
26+
@NonNull
27+
public static Prism4j.Grammar create(@NonNull Prism4j prism4j) {
2928

3029
final Prism4j.Grammar c = GrammarUtils.extend(
3130
GrammarUtils.require(prism4j, "clike"),
3231
"c",
3332
new GrammarUtils.TokenFilter() {
3433
@Override
35-
public boolean test(@NotNull Prism4j.Token token) {
34+
public boolean test(@NonNull Prism4j.Token token) {
3635
final String name = token.name();
3736
return !"class-name".equals(name) && !"boolean".equals(name);
3837
}

app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_clike.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77

88
package third_parties.io.noties.prism4j.languages;
99

10-
import org.jetbrains.annotations.NotNull;
11-
1210
import java.util.regex.Pattern;
1311

12+
import androidx.annotation.NonNull;
1413
import io.noties.prism4j.Prism4j;
1514

1615
import static io.noties.prism4j.Prism4j.grammar;
@@ -21,8 +20,8 @@
2120
@SuppressWarnings("unused")
2221
public abstract class Prism_clike {
2322

24-
@NotNull
25-
public static Prism4j.Grammar create(@NotNull Prism4j prism4j) {
23+
@NonNull
24+
public static Prism4j.Grammar create(@NonNull Prism4j prism4j) {
2625
return grammar(
2726
"clike",
2827
token(

app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_clojure.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
package third_parties.io.noties.prism4j.languages;
99

10-
import org.jetbrains.annotations.NotNull;
11-
10+
import androidx.annotation.NonNull;
1211
import io.noties.prism4j.Prism4j;
1312

1413
import static io.noties.prism4j.Prism4j.grammar;
@@ -20,8 +19,8 @@
2019
@SuppressWarnings("unused")
2120
public class Prism_clojure {
2221

23-
@NotNull
24-
public static Prism4j.Grammar create(@NotNull Prism4j prism4j) {
22+
@NonNull
23+
public static Prism4j.Grammar create(@NonNull Prism4j prism4j) {
2524
return grammar("clojure",
2625
token("comment", pattern(compile(";+.*"))),
2726
token("string", pattern(compile("\"(?:\\\\.|[^\\\\\"\\r\\n])*\""))),

app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_cpp.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
package third_parties.io.noties.prism4j.languages;
99

10-
import org.jetbrains.annotations.NotNull;
11-
10+
import androidx.annotation.NonNull;
1211
import io.noties.prism4j.GrammarUtils;
1312
import io.noties.prism4j.Prism4j;
1413
import io.noties.prism4j.annotations.Extend;
@@ -22,8 +21,8 @@
2221
@Extend("c")
2322
public class Prism_cpp {
2423

25-
@NotNull
26-
public static Prism4j.Grammar create(@NotNull Prism4j prism4j) {
24+
@NonNull
25+
public static Prism4j.Grammar create(@NonNull Prism4j prism4j) {
2726

2827
final Prism4j.Grammar cpp = GrammarUtils.extend(
2928
GrammarUtils.require(prism4j, "c"),

app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_csharp.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
package third_parties.io.noties.prism4j.languages;
99

1010

11-
import org.jetbrains.annotations.NotNull;
12-
11+
import androidx.annotation.NonNull;
1312
import io.noties.prism4j.GrammarUtils;
1413
import io.noties.prism4j.Prism4j;
1514
import io.noties.prism4j.annotations.Aliases;
@@ -27,8 +26,8 @@
2726
@Extend("clike")
2827
public class Prism_csharp {
2928

30-
@NotNull
31-
public static Prism4j.Grammar create(@NotNull Prism4j prism4j) {
29+
@NonNull
30+
public static Prism4j.Grammar create(@NonNull Prism4j prism4j) {
3231

3332
final Prism4j.Grammar classNameInsidePunctuation = grammar("inside",
3433
token("punctuation", pattern(compile("\\.")))

app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_css.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
package third_parties.io.noties.prism4j.languages;
99

10-
import org.jetbrains.annotations.NotNull;
11-
10+
import androidx.annotation.NonNull;
1211
import io.noties.prism4j.GrammarUtils;
1312
import io.noties.prism4j.Prism4j;
1413
import io.noties.prism4j.annotations.Modify;
@@ -27,8 +26,8 @@ public abstract class Prism_css {
2726
// before a language is requested (fro example css)
2827
// it won't be initialized (so we won't modify markup to highlight css) before it was requested...
2928

30-
@NotNull
31-
public static Prism4j.Grammar create(@NotNull Prism4j prism4j) {
29+
@NonNull
30+
public static Prism4j.Grammar create(@NonNull Prism4j prism4j) {
3231

3332
final Prism4j.Grammar grammar = grammar(
3433
"css",

app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_dart.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
package third_parties.io.noties.prism4j.languages;
99

10-
import org.jetbrains.annotations.NotNull;
11-
10+
import androidx.annotation.NonNull;
1211
import io.noties.prism4j.GrammarUtils;
1312
import io.noties.prism4j.Prism4j;
1413
import io.noties.prism4j.annotations.Extend;
@@ -21,8 +20,8 @@
2120
@Extend("clike")
2221
public class Prism_dart {
2322

24-
@NotNull
25-
public static Prism4j.Grammar create(@NotNull Prism4j prism4j) {
23+
@NonNull
24+
public static Prism4j.Grammar create(@NonNull Prism4j prism4j) {
2625

2726
final Prism4j.Grammar dart = GrammarUtils.extend(
2827
GrammarUtils.require(prism4j, "clike"),

app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_git.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
package third_parties.io.noties.prism4j.languages;
99

10-
import org.jetbrains.annotations.NotNull;
11-
10+
import androidx.annotation.NonNull;
1211
import io.noties.prism4j.Prism4j;
1312

1413
import static io.noties.prism4j.Prism4j.grammar;
@@ -20,8 +19,8 @@
2019
@SuppressWarnings("unused")
2120
public class Prism_git {
2221

23-
@NotNull
24-
public static Prism4j.Grammar create(@NotNull Prism4j prism4j) {
22+
@NonNull
23+
public static Prism4j.Grammar create(@NonNull Prism4j prism4j) {
2524
return grammar("git",
2625
token("comment", pattern(compile("^#.*", MULTILINE))),
2726
token("deleted", pattern(compile("^[-–].*", MULTILINE))),

app/src/main/java/third_parties/io/noties/prism4j/languages/Prism_go.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
package third_parties.io.noties.prism4j.languages;
99

10-
import org.jetbrains.annotations.NotNull;
11-
10+
import androidx.annotation.NonNull;
1211
import io.noties.prism4j.GrammarUtils;
1312
import io.noties.prism4j.Prism4j;
1413
import io.noties.prism4j.annotations.Extend;
@@ -22,15 +21,15 @@
2221
@Extend("clike")
2322
public class Prism_go {
2423

25-
@NotNull
26-
public static Prism4j.Grammar create(@NotNull Prism4j prism4j) {
24+
@NonNull
25+
public static Prism4j.Grammar create(@NonNull Prism4j prism4j) {
2726

2827
final Prism4j.Grammar go = GrammarUtils.extend(
2928
GrammarUtils.require(prism4j, "clike"),
3029
"go",
3130
new GrammarUtils.TokenFilter() {
3231
@Override
33-
public boolean test(@NotNull Prism4j.Token token) {
32+
public boolean test(@NonNull Prism4j.Token token) {
3433
return !"class-name".equals(token.name());
3534
}
3635
},

0 commit comments

Comments
 (0)