fix in getLeadingWhitespace(): if comment just go to the partition start

apanchenk · apanchenk · commit 6d3016f01f47 · 2011-06-06T15:28:20.000Z
diff --git a/plugins/org.eclipse.dltk.javascript.ui/src/org/eclipse/dltk/javascript/scriptdoc/JavaIndenter.java b/plugins/org.eclipse.dltk.javascript.ui/src/org/eclipse/dltk/javascript/scriptdoc/JavaIndenter.java
@@ -646,20 +646,12 @@ private StringBuffer getLeadingWhitespace(int offset) {
 			ITypedRegion partition = TextUtilities.getPartition(fDocument,
 					IJavaScriptPartitions.JS_PARTITIONING, lineOffset, true);
 			String type = partition.getType();
-			while ((type.equals(IJavaScriptPartitions.JS_DOC) || type
+			if ((type.equals(IJavaScriptPartitions.JS_DOC) || type
 					.equals(IJavaScriptPartitions.JS_MULTI_LINE_COMMENT))
 					&& lineOffset > 0) {
-				IRegion tmpLine = fDocument
-						.getLineInformationOfOffset(lineOffset - 1);
-				partition = TextUtilities.getPartition(fDocument,
-						IJavaScriptPartitions.JS_PARTITIONING,
-						tmpLine.getOffset(), false);
-				type = partition.getType();
-				if (type.equals(IJavaScriptPartitions.JS_DOC)
-						|| type.equals(IJavaScriptPartitions.JS_MULTI_LINE_COMMENT)) {
-					line = tmpLine;
-					lineOffset = line.getOffset();
-				}
+				line = fDocument.getLineInformationOfOffset(partition
+						.getOffset());
+				lineOffset = line.getOffset();
 			}
 			int nonWS = fScanner.findNonWhitespaceForwardInAnyPartition(
 					lineOffset, lineOffset + line.getLength());
