[formatter] Fixed exception when moving NLS tags (#1624)

Author: mateusz-matela

org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/FormatterBugsTests.java

@@ -13361,4 +13361,37 @@ public void testIssue1510() {
 		"\t\t\t\t\"\"\"; //$NON-NLS-1$\n" +
 		"\t}\n" +
 		"}");
-}}
+}
+/**
+ * https://github.com/eclipse-jdt/eclipse.jdt.core/issues/1624
+ */
+public void testIssue1624() {
+	this.formatterPrefs.use_tabs_only_for_leading_indentations = true;
+	this.formatterPrefs.alignment_for_logical_operator = Alignment.M_ONE_PER_LINE_SPLIT | Alignment.M_FORCE;
+	String source =
+		"""
+		class A {
+			private void foo(String a) {
+				boolean b = "GET".equals(a) || "POST".equals(a); //$NON-NLS-1$//$NON-NLS-2$
+				if (a == null)
+					a = "W"; //$NON-NLS-1$
+				// foo
+				// bar
+			}
+		}
+		""";
+	formatSource(source,
+		"""
+		class A {
+			private void foo(String a) {
+				boolean b = "GET".equals(a) //$NON-NLS-1$
+				        || "POST".equals(a); //$NON-NLS-1$
+				if (a == null)
+					a = "W"; //$NON-NLS-1$
+				// foo
+				// bar
+			}
+		}
+		""");
+}
+}

org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/linewrap/WrapExecutor.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2020 Mateusz Matela and others.
+ * Copyright (c) 2014, 2023 Mateusz Matela and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -353,6 +353,7 @@ protected boolean token(final Token token, final int index) {
 					lineComment.setAlign(WrapExecutor.this.tm.getNLSAlign(index));
 					lineComment.setInternalStructure(new ArrayList<>());
 					WrapExecutor.this.tm.insert(index + 1, lineComment);
+					fixWrapPolicyParents(index, 1);
 					structureChanged();
 					return true; // will fill the line comment structure in next step
 				}
@@ -413,13 +414,38 @@ protected boolean token(final Token token, final int index) {
 						|| (structure.size() == 1 && structure.get(0).tokenType == TokenNameWHITESPACE)) {
 					// all the tags have been moved to other lines
 					WrapExecutor.this.tm.remove(index);
+					fixWrapPolicyParents(index, -1);
 					structureChanged();
 				}
 
 				this.nlsTags.clear();
 			}
 			return true;
 		}
+
+		private void fixWrapPolicyParents(int changeIndex, int delta) {
+			TokenTraverser traverser = new TokenTraverser() {
+				HashMap<WrapPolicy, WrapPolicy> policyCache = new HashMap<>();
+
+				@Override
+				protected boolean token(Token token, int index) {
+					WrapPolicy policy = token.getWrapPolicy();
+					if (policy != null && policy.wrapParentIndex > changeIndex) {
+						WrapPolicy changedWp = this.policyCache.computeIfAbsent(policy,
+								p -> new WrapPolicy(p.wrapMode, p.wrapParentIndex + delta,
+										p.groupEndIndex == -1 ? -1 : p.groupEndIndex + delta, p.extraIndent,
+										p.structureDepth, p.penaltyMultiplier, p.isFirstInGroup, p.indentOnColumn));
+						token.setWrapPolicy(changedWp);
+					}
+					if (token.tokenType == TokenNameCOMMENT_LINE && token.getInternalStructure() != null) {
+						traverse(token.getInternalStructure(), 0);
+						structureChanged();
+					}
+					return true;
+				}
+			};
+			WrapExecutor.this.tm.traverse(changeIndex, traverser);
+		}
 	}
 
 	private final static int[] EMPTY_ARRAY = {};