jdk-sandbox: comparison src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/AttributedStringBuilder.java

equal deleted inserted replaced

-:197238c30630
+:eeb1c0da2126
 * Copyright (c) 2002-2018, the original author or authors.
 *
 * This software is distributable under the BSD license. See the terms of the
 * BSD license in the documentation provided with this software.
 *
-* http://www.opensource.org/licenses/bsd-license.php
+* https://opensource.org/licenses/BSD-3-Clause
 */
 package jdk.internal.org.jline.utils;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 public class AttributedStringBuilder extends AttributedCharSequence implements Appendable {
 private char[] buffer;
 private int[] style;
 private int length;
-private int tabs = 0;
+private TabStops tabs = new TabStops(0);
 private int lastLineLength = 0;
 private AttributedStyle current = AttributedStyle.DEFAULT;
 public static AttributedString append(CharSequence... strings) {
 AttributedStringBuilder sb = new AttributedStringBuilder();
 public AttributedStringBuilder append(AttributedCharSequence str, int start, int end) {
 ensureCapacity(length + end - start);
 for (int i = start; i < end; i++) {
 char c = str.charAt(i);
 int s = str.styleCodeAt(i) & ~current.getMask() | current.getStyle();
-if (tabs > 0 && c == '\t') {
+if (tabs.defined() && c == '\t') {
 insertTab(new AttributedStyle(s, 0));
 } else {
 ensureCapacity(length + 1);
 buffer[length] = c;
 style[length] = s;
 ansiState = 0;
 } else if (!(c >= '0' && c <= '9' || c == ';')) {
 // This is not a SGR code, so ignore
 ansiState = 0;
 }
-} else if (c == '\t' && tabs > 0) {
+} else if (c == '\t' && tabs.defined()) {
 insertTab(current);
 } else {
 ensureCapacity(length + 1);
 buffer[length] = c;
 style[length] = this.current.getStyle();
 }
 return this;
 }
 protected void insertTab(AttributedStyle s) {
-int nb = tabs - lastLineLength % tabs;
+int nb = tabs.spaces(lastLineLength);
 ensureCapacity(length + nb);
 for (int i = 0; i < nb; i++) {
 buffer[length] = ' ';
 style[length] = s.getStyle();
 length++;
 * If tab size is set to 0, tabs are not expanded (the default).
 * @param tabsize Spaces per tab or 0 for no tab expansion. Must be non-negative
 * @return this
 */
 public AttributedStringBuilder tabs(int tabsize) {
+if (tabsize < 0) {
+throw new IllegalArgumentException("Tab size must be non negative");
+}
+return tabs(Arrays.asList(tabsize));
+}
+public AttributedStringBuilder tabs(List<Integer> tabs) {
 if (length > 0) {
 throw new IllegalStateException("Cannot change tab size after appending text");
 }
-if (tabsize < 0) {
+this.tabs = new TabStops(tabs);
-throw new IllegalArgumentException("Tab size must be non negative");
-}
-this.tabs = tabsize;
 return this;
 }
 public AttributedStringBuilder styleMatches(Pattern pattern, AttributedStyle s) {
 Matcher matcher = pattern.matcher(this);
 }
 }
 return this;
 }
+public AttributedStringBuilder styleMatches(Pattern pattern, List<AttributedStyle> styles) {
+Matcher matcher = pattern.matcher(this);
+while (matcher.find()) {
+for (int group = 0; group < matcher.groupCount(); group++) {
+AttributedStyle s = styles.get(group);
+for (int i = matcher.start(group + 1); i < matcher.end(group + 1); i++) {
+style[i] = (style[i] & ~s.getMask()) | s.getStyle();
+}
+}
+}
+return this;
+}
+private class TabStops {
+private List<Integer> tabs = new ArrayList<>();
+private int lastStop = 0;
+private int lastSize = 0;
+public TabStops(int tabs) {
+this.lastSize = tabs;
+}
+public TabStops(List<Integer> tabs) {
+this.tabs = tabs;
+int p = 0;
+for (int s: tabs) {
+if (s <= p) {
+continue;
+}
+lastStop = s;
+lastSize = s - p;
+p = s;
+}
+}
+boolean defined() {
+return lastSize > 0;
+}
+int spaces(int lastLineLength) {
+int out = 0;
+if (lastLineLength >= lastStop) {
+out = lastSize - (lastLineLength - lastStop) % lastSize;
+} else {
+for (int s: tabs) {
+if (s > lastLineLength) {
+out = s - lastLineLength;
+break;
+}
+}
+}
+return out;
+}
+}
 }

changeset 58903	eeb1c0da2126
parent 52938	5ff7480c9e28