Merge remote-tracking branch 'origin/main'

Rosemoe · Aug 3, 2024 · 1e4a884 · 1e4a884
2 parents 3be55c2 + 72a267c
commit 1e4a884
Show file tree

Hide file tree

Showing 8 changed files with 561 additions and 548 deletions.
diff --git a/language-textmate/src/main/java/io/github/rosemoe/sora/langs/textmate/TextMateLanguage.java b/language-textmate/src/main/java/io/github/rosemoe/sora/langs/textmate/TextMateLanguage.java
@@ -35,7 +35,6 @@
 import org.eclipse.tm4e.languageconfiguration.internal.model.LanguageConfiguration;
 
 import java.io.Reader;
-import java.util.Objects;
 
 import io.github.rosemoe.sora.lang.EmptyLanguage;
 import io.github.rosemoe.sora.lang.analysis.AnalyzeManager;
@@ -51,7 +50,6 @@
 import io.github.rosemoe.sora.text.CharPosition;
 import io.github.rosemoe.sora.text.ContentReference;
 import io.github.rosemoe.sora.util.MyCharacter;
-import io.github.rosemoe.sora.widget.SymbolPairMatch;
 
 public class TextMateLanguage extends EmptyLanguage {
 
@@ -237,7 +235,10 @@ public void updateLanguage(GrammarDefinition grammarDefinition) {
     @NonNull
     @Override
     public AnalyzeManager getAnalyzeManager() {
-        return Objects.requireNonNullElse(textMateAnalyzer, EmptyAnalyzeManager.INSTANCE);
+        if (textMateAnalyzer == null) {
+            return EmptyAnalyzeManager.INSTANCE;
+        }
+        return textMateAnalyzer;
     }
 
     @Override
@@ -270,6 +271,10 @@ public TextMateNewlineHandler getNewlineHandler() {
         return newlineHandler;
     }
 
+    public LanguageConfiguration getLanguageConfiguration() {
+        return languageConfiguration;
+    }
+
     @Override
     public TextMateSymbolPairMatch getSymbolPairs() {
         return symbolPairMatch;

diff --git a/...-textmate/src/main/java/io/github/rosemoe/sora/langs/textmate/TextMateNewlineHandler.java b/...-textmate/src/main/java/io/github/rosemoe/sora/langs/textmate/TextMateNewlineHandler.java
@@ -414,24 +414,27 @@ public CompleteEnterAction getEnterAction(final Content content, final CharPosit
             return null;
         }
 
+        final EnterAction.IndentAction indentAction = enterResult.indentAction;
+        String appendText = enterResult.appendText;
+        final Integer removeText = enterResult.removeText;
         // Here we add `\t` to appendText first because enterAction is leveraging
         // appendText and removeText to change indentation.
-        if (enterResult.appendText == null) {
-            if (enterResult.indentAction == EnterAction.IndentAction.Indent || enterResult.indentAction == EnterAction.IndentAction.IndentOutdent) {
-                enterResult.appendText = "\t";
+        if (appendText == null) {
+            if (indentAction == EnterAction.IndentAction.Indent
+                    || indentAction == EnterAction.IndentAction.IndentOutdent) {
+                appendText = "\t";
             } else {
-                enterResult.appendText = "";
+                appendText = "";
             }
-        } else if (enterResult.indentAction == EnterAction.IndentAction.Indent) {
-            enterResult.appendText = "\t" + enterResult.appendText;
+        } else if (indentAction == EnterAction.IndentAction.Indent) {
+            appendText = "\t" + appendText;
         }
 
-        final var removeText = enterResult.removeText;
         if (removeText != null) {
             indentation = indentation.substring(0, indentation.length() - removeText);
         }
 
-        return new CompleteEnterAction(enterResult.indentAction, enterResult.appendText, enterResult.removeText, indentation);
+        return new CompleteEnterAction(indentAction, appendText, removeText, indentation);
 
     }
 
@@ -454,7 +457,7 @@ private String outdentString(final String str) {
 
 
     private String normalizeIndentation(final String str) {
-        return TextUtils.normalizeIndentation(str, language.getTabSize(), language.useTab());
+        return TextUtils.normalizeIndentation(str, language.getTabSize(), !language.useTab());
     }
 
 

diff --git a/language-textmate/src/main/java/org/eclipse/tm4e/core/internal/grammar/LineTokens.java b/language-textmate/src/main/java/org/eclipse/tm4e/core/internal/grammar/LineTokens.java
@@ -227,7 +227,7 @@ IToken[] getResult(final StateStack stack, final int lineLength) {
 			this._tokens.getLast().setStartIndex(0);
 		}
 
-		return this._tokens.toArray(IToken[]::new);
+		return this._tokens.toArray(new IToken[0]);
 	}
 
 	int[] getBinaryResult(final StateStack stack, final int lineLength) {

diff --git a/language-textmate/src/main/java/org/eclipse/tm4e/core/internal/rule/RuleFactory.java b/language-textmate/src/main/java/org/eclipse/tm4e/core/internal/rule/RuleFactory.java
@@ -247,7 +247,7 @@ private static CompilePatternsResult _compilePatterns(@Nullable final Collection
             }
         }
 
-        return new CompilePatternsResult(r.toArray(RuleId[]::new), patterns.size() != r.size());
+        return new CompilePatternsResult(r.toArray(new RuleId[0]), patterns.size() != r.size());
     }
 
     private RuleFactory() {

diff --git a/language-textmate/src/main/java/org/eclipse/tm4e/core/internal/utils/MoreCollections.java b/language-textmate/src/main/java/org/eclipse/tm4e/core/internal/utils/MoreCollections.java
@@ -17,6 +17,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -110,7 +111,9 @@ public static String toStringWithIndex(final List<?> list) {
 	 * @return a new list without null elements
 	 */
 	public static <T> List<T> noNulls(final @Nullable List<T> coll) {
-		return coll == null || coll.isEmpty() ? Collections.emptyList() : coll.stream().filter(Objects::nonNull).toList();
+		return coll == null || coll.isEmpty() ? Collections.emptyList() : coll.stream()
+				.filter(t -> t != null)
+				.collect(Collectors.toList());
 	}
 
 	private MoreCollections() {