backport upstream changes

jonahgraham · Feb 27, 2023 · 861eada · 861eada
1 parent 68c81be
commit 861eada
Showing 1 changed file with 9 additions and 8 deletions.
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
@@ -42,8 +42,8 @@ public final class StateStack implements IStateStack {
 	@NonNullByDefault({}) // https://github.com/eclipse-jdt/eclipse.jdt.core/issues/233
 	record Frame(
 		RuleId ruleId,
-		int enterPos,
-		int anchorPos,
+		@Nullable Integer enterPos,
+		@Nullable Integer anchorPos,
 		boolean beginRuleCapturedEOL,
 		@Nullable String endRule,
 		List<AttributedScopeStack.Frame> nameScopesList,
@@ -263,8 +263,7 @@ private void _writeString(final List<String> res) {
 		if (parent != null) {
 			parent._writeString(res);
 		}
-		// , TODO-${this.nameScopesList}, TODO-${this.contentNameScopesList})`;
-		res.add("(" + ruleId + ")");
+		res.add("(" + ruleId + ", " + this.nameScopesList + ", " + this.contentNameScopesList + ")");
 	}
 
 	StateStack withContentNameScopesList(final @Nullable AttributedScopeStack contentNameScopesList) {
@@ -315,8 +314,8 @@ public Frame toStateStackFrame() {
 		final var parent = this.parent;
 		return new Frame(
 			this.ruleId,
-			this._enterPos,
-			this._anchorPos,
+			null,
+			null,
 			this.beginRuleCapturedEOL,
 			this.endRule,
 			nameScopesList != null
@@ -330,11 +329,13 @@ public Frame toStateStackFrame() {
 	public static StateStack pushFrame(@Nullable final StateStack self, final Frame frame) {
 		final var namesScopeList = AttributedScopeStack.fromExtension(self == null ? null : self.nameScopesList,
 			frame.nameScopesList);
+		final var enterPos = frame.enterPos;
+		final var anchorPos = frame.anchorPos;
 		return new StateStack(
 			self,
 			frame.ruleId,
-			frame.enterPos,
-			frame.anchorPos,
+			enterPos == null ? -1 : enterPos,
+			anchorPos == null ? -1 : anchorPos,
 			frame.beginRuleCapturedEOL,
 			frame.endRule,
 			namesScopeList,