Adapt changes in upstream project

org.eclipse.tm4e.core.tests/.settings/org.eclipse.jdt.core.prefs

@@ -233,8 +233,8 @@ org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=true
 org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
 org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
 org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
 org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

org.eclipse.tm4e.core.tests/src/main/java/org/eclipse/tm4e/core/grammar/internal/RawTestImpl.java

@@ -22,7 +22,8 @@
 import java.util.List;
 
 import org.eclipse.tm4e.core.grammar.IGrammar;
-import org.eclipse.tm4e.core.grammar.IStackElement;
+import org.eclipse.tm4e.core.grammar.IStateStack;
+import org.eclipse.tm4e.core.registry.IGrammarSource;
 import org.eclipse.tm4e.core.registry.IRegistryOptions;
 import org.eclipse.tm4e.core.registry.Registry;
 
@@ -71,17 +72,6 @@ public List<RawTestLine> getLines() {
 
 	public void executeTest() throws Exception {
 		final var options = new IRegistryOptions() {
-
-			@Override
-			public String getFilePath(final String scopeName) {
-				return null;
-			}
-
-			@Override
-			public InputStream getInputStream(final String scopeName) throws IOException {
-				return null;
-			}
-
 			@Override
 			public Collection<String> getInjections(final String scopeName) {
 				if (scopeName.equals(getGrammarScopeName())) {
@@ -100,7 +90,7 @@ public Collection<String> getInjections(final String scopeName) {
 			throw new Exception("I HAVE NO GRAMMAR FOR TEST");
 		}
 
-		IStackElement prevState = null;
+		IStateStack prevState = null;
 		for (final var testLine : lines) {
 			prevState = assertLineTokenization(grammar, testLine, prevState);
 		}
@@ -109,26 +99,27 @@ public Collection<String> getInjections(final String scopeName) {
 	private IGrammar getGrammar(final Registry registry, final File testLocation) throws Exception {
 		IGrammar grammar = null;
 		for (final String grammarPath : getGrammars()) {
-			final IGrammar tmpGrammar = registry.loadGrammarFromPathSync(new File(testLocation, grammarPath));
+			final IGrammar tmpGrammar = registry
+				.addGrammar(IGrammarSource.fromFile(new File(testLocation, grammarPath).toPath()));
 			if (grammarPath.equals(getGrammarPath())) {
 				grammar = tmpGrammar;
 			}
 		}
 		return grammar;
 	}
 
-	private static IStackElement assertLineTokenization(final IGrammar grammar, final RawTestLine testCase,
-			final IStackElement prevState) {
+	private static IStateStack assertLineTokenization(final IGrammar grammar, final RawTestLine testCase,
+		final IStateStack prevState) {
 		final var line = testCase.line;
 		final var actual = grammar.tokenizeLine(line, prevState);
 
 		final var actualTokens = Arrays.stream(actual.getTokens())
-				.map(token -> new RawToken(
-						line.substring(
-								token.getStartIndex(),
-								Math.min(token.getEndIndex(), line.length())), // TODO Math.min not required in upstream why?
-						token.getScopes()))
-				.collect(toList());
+			.map(token -> new RawToken(
+				line.substring(
+					token.getStartIndex(),
+					Math.min(token.getEndIndex(), line.length())), // TODO Math.min not required in upstream why?
+				token.getScopes()))
+			.collect(toList());
 
 		// TODO@Alex: fix tests instead of working around
 		if (!line.isEmpty()) {
@@ -142,16 +133,16 @@ private static IStackElement assertLineTokenization(final IGrammar grammar, fina
 	}
 
 	private static void deepEqual(final List<RawToken> actualTokens, final List<RawToken> expextedTokens,
-			final String message) {
+		final String message) {
 
 		// compare collection size
 		if (expextedTokens.size() != actualTokens.size()) {
 			final var actualTokensStr = actualTokens.stream().map(Object::toString).collect(joining("\n"));
 			final var expextedTokensStr = expextedTokens.stream().map(Object::toString).collect(joining("\n"));
 
 			assertEquals(expextedTokensStr, actualTokensStr,
-					message + " (collection size problem: actual=" + actualTokens.size() + " expected="
-							+ expextedTokens.size() + ")");
+				message + " (collection size problem: actual=" + actualTokens.size() + " expected="
+					+ expextedTokens.size() + ")");
 		}
 
 		// compare item

org.eclipse.tm4e.core.tests/src/main/java/org/eclipse/tm4e/core/internal/theme/AbstractThemeTest.java

@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2022 Sebastian Thomschke and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Initial code from https://github.com/Microsoft/vscode-textmate/
+ * Initial copyright Copyright (C) Microsoft Corporation. All rights reserved.
+ * Initial license: MIT
+ *
+ * Contributors:
+ * - Microsoft Corporation: Initial code, written in TypeScript, licensed under MIT license
+ * - Sebastian Thomschke - translation and adaptation to Java
+ */
+package org.eclipse.tm4e.core.internal.theme;
+
+import java.io.StringReader;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.tm4e.core.internal.theme.reader.ThemeReader;
+import org.junit.jupiter.api.Assertions;
+
+public abstract class AbstractThemeTest extends Assertions {
+
+	protected static final int _NOT_SET = 0;
+
+	protected static <T> List<T> list(@SuppressWarnings("unchecked") final T... items) {
+		if (items.length == 0)
+			return Collections.emptyList();
+		return Arrays.asList(items);
+	}
+
+	@SuppressWarnings("unchecked")
+	protected static <K, V> Map<K, V> map(final K k, final V v, final Object... moreKVs) {
+		final var map = new HashMap<K, V>();
+		map.put(k, v);
+		if (moreKVs.length == 0)
+			return map;
+		boolean nextIsValue = false;
+		K key = null;
+		for (final Object obj : moreKVs)
+			if (nextIsValue) {
+				map.put(key, (V) obj);
+				nextIsValue = false;
+			} else {
+				key = (K) obj;
+				nextIsValue = true;
+			}
+		return map;
+	}
+
+	protected static Theme createTheme(final ParsedThemeRule... rules) {
+		return Theme.createFromParsedTheme(list(rules), null);
+	}
+
+	protected static Theme createTheme(final String themeAsJsonString) throws Exception {
+		return Theme.createFromRawTheme(
+			ThemeReader.readThemeSync("theme.json", new StringReader(themeAsJsonString)), null);
+	}
+
+	protected static List<ParsedThemeRule> parseTheme(final String themeAsJsonString) throws Exception {
+		return Theme.parseTheme(ThemeReader.readThemeSync("theme.json", new StringReader(themeAsJsonString)));
+	}
+}