This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 1485d27 [NETBEANS-3085] Improving text block handling.
1485d27 is described below
commit 1485d27179ef28f750bdb4ceb8017b3c93e6098c
Author: Jan Lahoda <jlah...@netbeans.org>
AuthorDate: Mon Sep 16 07:16:41 2019 +0200
[NETBEANS-3085] Improving text block handling.
---
.../src/org/netbeans/editor/BaseKit.java | 7 +--
ide/editor.lib2/apichanges.xml | 12 +++++
ide/editor.lib2/nbproject/project.properties | 2 +-
.../editor/typinghooks/TypedTextInterceptor.java | 30 +++++++++++-
java/java.editor/nbproject/project.xml | 2 +-
.../modules/editor/java/TypingCompletion.java | 39 ++++++++-------
.../java/editor/imports/ClipboardHandler.java | 3 +-
.../editor/java/TypingCompletionUnitTest.java | 32 ++++++++++++-
java/java.lexer/apichanges.xml | 4 +-
.../src/org/netbeans/lib/java/lexer/JavaLexer.java | 37 ++++++++------
.../lib/java/lexer/JavaLexerBatchTest.java | 56 ++++++++++++++++++----
.../org/netbeans/api/java/source/SourceUtils.java | 20 --------
.../modules/java/source/pretty/VeryPretty.java | 3 +-
13 files changed, 172 insertions(+), 75 deletions(-)
diff --git a/ide/editor.lib/src/org/netbeans/editor/BaseKit.java
b/ide/editor.lib/src/org/netbeans/editor/BaseKit.java
index 0add683..3eeebc3 100644
--- a/ide/editor.lib/src/org/netbeans/editor/BaseKit.java
+++ b/ide/editor.lib/src/org/netbeans/editor/BaseKit.java
@@ -1250,9 +1250,10 @@ public class BaseKit extends DefaultEditorKit {
Object[] r = transaction.textTyped();
String insertionText = r == null ? cmd
: (String) r[0];
int caretPosition = r == null ? -1 :
(Integer) r[1];
+ boolean formatNewLines = r == null ?
false : (Boolean) r[2];
try {
- performTextInsertion(target,
insertionOffset.getOffset(), insertionText, caretPosition);
+ performTextInsertion(target,
insertionOffset.getOffset(), insertionText, caretPosition, formatNewLines);
result[0] = Boolean.TRUE;
result[1] = insertionText;
} catch (BadLocationException ble) {
@@ -1357,7 +1358,7 @@ public class BaseKit extends DefaultEditorKit {
// Private implementation
// --------------------------------------------------------------------
- private void performTextInsertion(JTextComponent target, int
insertionOffset, String insertionText, int caretPosition) throws
BadLocationException {
+ private void performTextInsertion(JTextComponent target, int
insertionOffset, String insertionText, int caretPosition, boolean
formatNewLines) throws BadLocationException {
final BaseDocument doc = (BaseDocument)target.getDocument();
try {
@@ -1378,7 +1379,7 @@ public class BaseKit extends DefaultEditorKit {
int targetCaretOffset = caretPosition;
for (int i = 0; i < insertionText.length();) {
int end = insertionText.indexOf('\n', i);
- if (end == (-1)) end = insertionText.length();
+ if (end == (-1) || !formatNewLines) end =
insertionText.length();
String currentLine = insertionText.substring(i, end);
if (i == 0) {
if (Utilities.isSelectionShowing(caret)) { // valid
selection
diff --git a/ide/editor.lib2/apichanges.xml b/ide/editor.lib2/apichanges.xml
index 62f76c5..0387d66 100644
--- a/ide/editor.lib2/apichanges.xml
+++ b/ide/editor.lib2/apichanges.xml
@@ -83,6 +83,18 @@ is the proper place.
<!-- ACTUAL CHANGES BEGIN HERE: -->
<changes>
+ <change id="TypedTextInterceptorIndent">
+ <summary>Ability to indent text set to
TypedTextInterceptor</summary>
+ <version major="2" minor="26"/>
+ <date day="15" month="9" year="2019"/>
+ <author login="jlahoda"/>
+ <compatibility binary="compatible" source="compatible"
semantic="compatible" addition="yes" deprecation="no" deletion="no"
modification="no" />
+ <description>
+ <p>Added TypedTextInterceptor.MutableContext.setText overload,
which
+ optionally re-indents the provided text.</p>
+ </description>
+ <class name="TypedTextInterceptor"
package="org.netbeans.spi.editor.typinghooks"/>
+ </change>
<change id="PrependedTextOpt">
<summary>Prepended text for highlights</summary>
<version major="2" minor="24"/>
diff --git a/ide/editor.lib2/nbproject/project.properties
b/ide/editor.lib2/nbproject/project.properties
index 8af21d9..a469b5b 100644
--- a/ide/editor.lib2/nbproject/project.properties
+++ b/ide/editor.lib2/nbproject/project.properties
@@ -18,7 +18,7 @@
is.autoload=true
javac.source=1.7
javac.compilerargs=-Xlint:unchecked
-spec.version.base=2.25.0
+spec.version.base=2.26.0
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
diff --git
a/ide/editor.lib2/src/org/netbeans/spi/editor/typinghooks/TypedTextInterceptor.java
b/ide/editor.lib2/src/org/netbeans/spi/editor/typinghooks/TypedTextInterceptor.java
index ed0a249..73ce72d 100644
---
a/ide/editor.lib2/src/org/netbeans/spi/editor/typinghooks/TypedTextInterceptor.java
+++
b/ide/editor.lib2/src/org/netbeans/spi/editor/typinghooks/TypedTextInterceptor.java
@@ -276,11 +276,37 @@ public interface TypedTextInterceptor {
* are <code><0, text.getLength()></code>.
*/
public void setText(String text, int caretPosition) {
+ setText(text, caretPosition, false);
+ }
+
+ /**
+ * Sets the insertion text and adjusted caret position. This method can
+ * be used for modifying text typed by a user that would normally be
+ * inserted into a document.
+ *
+ * <p>There is no restriction on the new text
+ * set by this method, except that it must not be <code>null</code>.
It can
+ * be of any length (including an empty string) and can even span
multiple lines.
+ *
+ * <p>It is important to remember that the adjusted caret position is
+ * relative to the new text. Therefore valid values for the
<code>caretPosition</code>
+ * parameter are <code><0, text.getLength()></code>! The
adjusted position
+ * is <b>not</b> a document offset.
+ *
+ * @param text The new text that will be inserted to a document.
+ * @param caretPosition The adjusted caret position <b>inside</b> the
new text.
+ * This position is relative to the new text. Valid values for this
parameter
+ * are <code><0, text.getLength()></code>.
+ * @param formatNewLines true if new lines in the provided text should
be indented.
+ * @since 2.26
+ */
+ public void setText(String text, int caretPosition, boolean
formatNewLines) {
assert text != null : "Invalid text, it must not be null.";
//NOI18N
assert caretPosition >= 0 && caretPosition <= text.length() :
"Invalid caretPostion=" + caretPosition + ", text.length=" + text.length();
//NOI18N
this.insertionText = text;
this.caretPosition = caretPosition;
+ this.formatNewLines = formatNewLines;
}
/**
@@ -302,6 +328,7 @@ public interface TypedTextInterceptor {
private String insertionText = null;
private String replacedText = null;
private int caretPosition = -1;
+ private boolean formatNewLines = false;
private MutableContext(JTextComponent c, Position offset, String
typedText, String replacedText) {
super(c, offset, typedText);
@@ -318,7 +345,7 @@ public interface TypedTextInterceptor {
@Override
public Object[] getTtiContextData(MutableContext context) {
return context.insertionText != null ?
- new Object [] { context.insertionText,
context.caretPosition } :
+ new Object [] { context.insertionText,
context.caretPosition, context.formatNewLines } :
null;
}
@@ -326,6 +353,7 @@ public interface TypedTextInterceptor {
public void resetTtiContextData(MutableContext context) {
context.insertionText = null;
context.caretPosition = -1;
+ context.formatNewLines = false;
}
@Override
diff --git a/java/java.editor/nbproject/project.xml
b/java/java.editor/nbproject/project.xml
index 427bf0d..1517024 100644
--- a/java/java.editor/nbproject/project.xml
+++ b/java/java.editor/nbproject/project.xml
@@ -163,7 +163,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
- <specification-version>2.6</specification-version>
+ <specification-version>2.26</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git
a/java/java.editor/src/org/netbeans/modules/editor/java/TypingCompletion.java
b/java/java.editor/src/org/netbeans/modules/editor/java/TypingCompletion.java
index 1641a25..f09bf49 100644
---
a/java/java.editor/src/org/netbeans/modules/editor/java/TypingCompletion.java
+++
b/java/java.editor/src/org/netbeans/modules/editor/java/TypingCompletion.java
@@ -25,10 +25,11 @@ import java.util.prefs.Preferences;
import javax.lang.model.SourceVersion;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
+import org.netbeans.api.annotations.common.NullAllowed;
import org.netbeans.api.editor.mimelookup.MimeLookup;
import org.netbeans.api.editor.settings.SimpleValueNames;
import org.netbeans.api.java.lexer.JavaTokenId;
-import static org.netbeans.api.java.source.SourceUtils.isTextBlockSupported;
+import org.netbeans.api.java.queries.SourceLevelQuery;
import org.netbeans.api.lexer.PartType;
import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.lexer.TokenSequence;
@@ -40,6 +41,7 @@ import
org.netbeans.spi.editor.typinghooks.TypedBreakInterceptor;
import org.netbeans.spi.editor.typinghooks.TypedTextInterceptor;
import org.openide.filesystems.FileObject;
import org.openide.loaders.DataObject;
+import org.openide.modules.SpecificationVersion;
/**
* This static class groups the whole aspect of bracket completion. It is
@@ -73,7 +75,8 @@ class TypingCompletion {
char removedChar = context.getText().charAt(0);
int caretOffset = context.isBackwardDelete() ? context.getOffset() - 1
: context.getOffset();
if (removedChar == '\"') {
- if (ts.token().id() == JavaTokenId.STRING_LITERAL && ts.offset()
== caretOffset) {
+ if ((ts.token().id() == JavaTokenId.STRING_LITERAL && ts.offset()
== caretOffset) ||
+ (ts.token().id() == JavaTokenId.MULTILINE_STRING_LITERAL &&
ts.offset() <= caretOffset - 2)) {
context.getDocument().remove(caretOffset, 1);
}
} else if (removedChar == '\'') {
@@ -142,18 +145,10 @@ class TypingCompletion {
return;
}
-
char chr = context.getDocument().getText(context.getOffset(),
1).charAt(0);
- if (chr == ')' || chr == ',' || chr == '\'' || chr == ' ' || chr ==
']' || chr == '}' || chr == '\n' || chr == '\t' || chr == ';') {
+ if (chr == ')' || chr == ',' || chr == '\"' || chr == '\'' || chr == '
' || chr == ']' || chr == '}' || chr == '\n' || chr == '\t' || chr == ';') {
char insChr = context.getText().charAt(0);
context.setText("" + insChr + matching(insChr), 1); // NOI18N
- } else if (chr == '\"') {
- if ((context.getOffset() > 2 &&
context.getDocument().getText(context.getOffset() - 2, 3).equals("\"\"\"")) &&
- isTextBlockSupported(getFileObject((BaseDocument)
context.getDocument()))) {
- context.setText("\"\n\"\"\"", 2); // NOI18N
- } else {
- context.setText("\"\"", 1); // NOI18N
- }
}
}
@@ -258,8 +253,7 @@ class TypingCompletion {
if (context.getText().equals("\"") && context.getOffset() >= 2 &&
context.getDocument().getText(context.getOffset() - 2,
2).equals("\"\"") &&
isTextBlockSupported(getFileObject((BaseDocument)
context.getDocument()))) {
- context.setText("\"\n\"\"\"", 2); // NOI18N
- Thread.dumpStack();
+ context.setText("\"\n\"\"\"", 2, true); // NOI18N
} else {
context.setText(context.getText() + context.getText(), 1);
}
@@ -269,7 +263,7 @@ class TypingCompletion {
id = javaTS.token().id();
if ((id == JavaTokenId.STRING_LITERAL) &&
(javaTS.token().text().toString().equals("\"\""))) {
if (context.getDocument().getText(context.getOffset(),
2).equals("\"\"")) {
- context.setText("\"\"\"\n\"", 4);
+ context.setText("\"\"\"\n\"", 4, true);
}
}
javaTS.movePrevious();
@@ -315,6 +309,20 @@ class TypingCompletion {
return context.getDocument().getText(context.getOffset() - 1,
1).charAt(0) == '\\';
}
+ private static boolean isTextBlockSupported(
+ @NullAllowed FileObject fileObject) {
+ SpecificationVersion supportedVer = new SpecificationVersion("13");
//NOI18N
+
+ if (fileObject != null) {
+ SpecificationVersion sourceVer = new
SpecificationVersion(SourceLevelQuery.getSourceLevel(fileObject));
+ if (sourceVer.compareTo(supportedVer) < 0) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
/**
* Resolve whether pairing right curly should be added automatically
* at the caret position or not.
@@ -846,8 +854,7 @@ class TypingCompletion {
}
private static FileObject getFileObject(BaseDocument doc) {
- DataObject dob = NbEditorUtilities.getDataObject(doc);
- return dob.getPrimaryFile();
+ return doc != null ? NbEditorUtilities.getFileObject(doc) : null;
}
private static Set<JavaTokenId> STRING_AND_COMMENT_TOKENS =
EnumSet.of(JavaTokenId.STRING_LITERAL, JavaTokenId.LINE_COMMENT,
JavaTokenId.JAVADOC_COMMENT, JavaTokenId.BLOCK_COMMENT,
JavaTokenId.CHAR_LITERAL, JavaTokenId.MULTILINE_STRING_LITERAL);
diff --git
a/java/java.editor/src/org/netbeans/modules/java/editor/imports/ClipboardHandler.java
b/java/java.editor/src/org/netbeans/modules/java/editor/imports/ClipboardHandler.java
index 0620499..161b9f4 100644
---
a/java/java.editor/src/org/netbeans/modules/java/editor/imports/ClipboardHandler.java
+++
b/java/java.editor/src/org/netbeans/modules/java/editor/imports/ClipboardHandler.java
@@ -89,7 +89,6 @@ import org.netbeans.api.java.source.GeneratorUtilities;
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.java.source.ModificationResult;
import org.netbeans.api.java.source.SourceUtils;
-import static org.netbeans.api.java.source.SourceUtils.isTextBlockSupported;
import org.netbeans.api.java.source.Task;
import org.netbeans.api.java.source.WorkingCopy;
import org.netbeans.api.lexer.TokenHierarchy;
@@ -664,7 +663,7 @@ public class ClipboardHandler {
return data;
}
});
- } else if
((isTextBlockSupported(NbEditorUtilities.getFileObject(((JTextComponent)comp).getDocument())))
&& insideToken((JTextComponent) comp, JavaTokenId.MULTILINE_STRING_LITERAL)) {
+ } else if (insideToken((JTextComponent) comp,
JavaTokenId.MULTILINE_STRING_LITERAL)) {
final Transferable t = support.getTransferable();
return delegate.importData(comp, new Transferable() {
@Override
diff --git
a/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/TypingCompletionUnitTest.java
b/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/TypingCompletionUnitTest.java
index db4d1ff..14f1990 100644
---
a/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/TypingCompletionUnitTest.java
+++
b/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/TypingCompletionUnitTest.java
@@ -1154,20 +1154,48 @@ public class TypingCompletionUnitTest extends
NbTestCase {
ctx.assertDocumentTextEquals("()|");
}
- public void testRemoveQuotesBackSpace() throws Exception {
+ public void testRemoveQuotesBackSpace1() throws Exception {
+ Context ctx = new Context(new JavaKit(),
+ "\"|\"");
+ ctx.typeChar('\b');
+ ctx.assertDocumentTextEquals("|");
+ }
+
+ public void testRemoveQuotesBackSpace2() throws Exception {
Context ctx = new Context(new JavaKit(),
"\"\"\"|\"");
ctx.typeChar('\b');
ctx.assertDocumentTextEquals("\"\"|");
}
- public void testRemoveQuotesDelete() throws Exception {
+ public void testRemoveQuotesBackSpace3() throws Exception {
+ Context ctx = new Context(new JavaKit(),
+ "\"\"\"|\";");
+ ctx.typeChar('\b');
+ ctx.assertDocumentTextEquals("\"\"|;");
+ }
+
+ public void testRemoveQuotesDelete1() throws Exception {
+ Context ctx = new Context(new JavaKit(),
+ "|\"\"");
+ ctx.typeChar('\f');
+ ctx.assertDocumentTextEquals("|");
+ }
+
+ public void testRemoveQuotesDelete2() throws Exception {
Context ctx = new Context(new JavaKit(),
"\"\"|\"\"");
ctx.typeChar('\f');
ctx.assertDocumentTextEquals("\"\"|");
}
+ public void testRemoveQuotesDelete3() throws Exception {
+ Context ctx = new Context(new JavaKit(),
+ "\"\"|\"\";");
+ ctx.typeChar('\f');
+ ctx.assertDocumentTextEquals("\"\"|;");
+ }
+
public void testRemoveQuotes2BackSpace() throws Exception {
Context ctx = new Context(new JavaKit(),
"\'\'\'|\'");
diff --git a/java/java.lexer/apichanges.xml b/java/java.lexer/apichanges.xml
index c8ceebf..d337df1 100644
--- a/java/java.lexer/apichanges.xml
+++ b/java/java.lexer/apichanges.xml
@@ -85,13 +85,13 @@ is the proper place.
<changes>
<change id="RawStringLiteral">
<api name="general"/>
- <summary>Added RAW_STRING_LITERAL JavaTokenKind</summary>
+ <summary>Added MULTILINE_STRING_LITERAL JavaTokenKind</summary>
<version major="1" minor="41"/>
<date day="22" month="4" year="2018"/>
<author login="jlahoda"/>
<compatibility addition="yes" binary="compatible" deletion="no"
deprecation="no" modification="no" semantic="compatible" source="compatible"/>
<description>
- Added JavaTokenId.RAW_STRING_LITERAL.
+ Added JavaTokenId.MULTILINE_STRING_LITERAL.
</description>
<class package="org.netbeans.api.java.lexer" name="JavaTokenId"/>
</change>
diff --git a/java/java.lexer/src/org/netbeans/lib/java/lexer/JavaLexer.java
b/java/java.lexer/src/org/netbeans/lib/java/lexer/JavaLexer.java
index 8a2b651..ec27b8e 100644
--- a/java/java.lexer/src/org/netbeans/lib/java/lexer/JavaLexer.java
+++ b/java/java.lexer/src/org/netbeans/lib/java/lexer/JavaLexer.java
@@ -173,21 +173,28 @@ public class JavaLexer implements Lexer<JavaTokenId> {
while (true) {
switch (nextChar()) {
case '"': // NOI18N
- if (this.version >= 13) {
- String text = input.readText().toString();
- if (text.length() == 2) {
- if (nextChar() != '"') {
- input.backup(1); //TODO: EOF???
- return token(lookupId);
- }
- lookupId =
JavaTokenId.MULTILINE_STRING_LITERAL;
+ String text = input.readText().toString();
+ if (text.length() == 2) {
+ int mark = input.readLength();
+ if (nextChar() != '"') {
+ input.backup(1); //TODO: EOF???
+ return token(lookupId);
}
- if (lookupId ==
JavaTokenId.MULTILINE_STRING_LITERAL) {
- if (text.endsWith("\"\"\"") &&
!text.endsWith("\\\"\"\"") && text.length() > 6) {
- return token(lookupId);
- } else {
- break;
- }
+ int c2 = nextChar();
+ while (Character.isWhitespace(c2) && c2 !=
'\n') {
+ c2 = nextChar();
+ }
+ if (c2 != '\n') {
+ input.backup(input.readLengthEOF()-
mark);
+ return token(lookupId);
+ }
+ lookupId =
JavaTokenId.MULTILINE_STRING_LITERAL;
+ }
+ if (lookupId ==
JavaTokenId.MULTILINE_STRING_LITERAL) {
+ if (text.endsWith("\"\"\"") &&
!text.endsWith("\\\"\"\"") && text.length() > 6) {
+ return token(lookupId);
+ } else {
+ break;
}
}
@@ -197,7 +204,7 @@ public class JavaLexer implements Lexer<JavaTokenId> {
break;
case '\r': consumeNewline();
case '\n':
- if (lookupId ==
JavaTokenId.MULTILINE_STRING_LITERAL && this.version >= 13) {
+ if (lookupId ==
JavaTokenId.MULTILINE_STRING_LITERAL) {
break;
}
case EOF:
diff --git
a/java/java.lexer/test/unit/src/org/netbeans/lib/java/lexer/JavaLexerBatchTest.java
b/java/java.lexer/test/unit/src/org/netbeans/lib/java/lexer/JavaLexerBatchTest.java
index 757ae28..ecf2181 100644
---
a/java/java.lexer/test/unit/src/org/netbeans/lib/java/lexer/JavaLexerBatchTest.java
+++
b/java/java.lexer/test/unit/src/org/netbeans/lib/java/lexer/JavaLexerBatchTest.java
@@ -698,31 +698,25 @@ public class JavaLexerBatchTest extends TestCase {
LexerTestUtilities.assertNextTokenEquals(ts, JavaTokenId.WHITESPACE, "
");
}
- private void enableRawStringLiterals(InputAttributes attr) {
- attr.setValue(JavaTokenId.language(), "version", (Supplier<String>) ()
-> {
- return "13";
- }, true);
- }
-
public void testMultilineLiteral() {
String text = "\"\"\"\n2\"3\n4\\\"\"\"5\"\"\\\"6\n7\"\"\"
\"\"\"wrong\"\"\" \"\"\"\nbla\n";
InputAttributes attr = new InputAttributes();
- enableRawStringLiterals(attr);
TokenHierarchy<?> hi = TokenHierarchy.create(text, false,
JavaTokenId.language(), EnumSet.noneOf(JavaTokenId.class), attr);
TokenSequence<?> ts = hi.tokenSequence();
LexerTestUtilities.assertNextTokenEquals(ts,
JavaTokenId.MULTILINE_STRING_LITERAL,
"\"\"\"\n2\"3\n4\\\"\"\"5\"\"\\\"6\n7\"\"\"");
LexerTestUtilities.assertNextTokenEquals(ts, JavaTokenId.WHITESPACE, "
");
- LexerTestUtilities.assertNextTokenEquals(ts,
JavaTokenId.MULTILINE_STRING_LITERAL, "\"\"\"wrong\"\"\"");
+ LexerTestUtilities.assertNextTokenEquals(ts,
JavaTokenId.STRING_LITERAL, "\"\"");
+ LexerTestUtilities.assertNextTokenEquals(ts,
JavaTokenId.STRING_LITERAL, "\"wrong\"");
+ LexerTestUtilities.assertNextTokenEquals(ts,
JavaTokenId.STRING_LITERAL, "\"\"");
LexerTestUtilities.assertNextTokenEquals(ts, JavaTokenId.WHITESPACE, "
");
LexerTestUtilities.assertNextTokenEquals(ts,
JavaTokenId.MULTILINE_STRING_LITERAL, "\"\"\"\nbla\n");
assertFalse(ts.moveNext());
}
- public void testTrailing() {
+ public void testTrailing1() {
String text = "\"\"";
InputAttributes attr = new InputAttributes();
- enableRawStringLiterals(attr);
TokenHierarchy<?> hi = TokenHierarchy.create(text, false,
JavaTokenId.language(), EnumSet.noneOf(JavaTokenId.class), attr);
TokenSequence<?> ts = hi.tokenSequence();
@@ -730,4 +724,46 @@ public class JavaLexerBatchTest extends TestCase {
assertFalse(ts.moveNext());
}
+ public void testTrailing2() {
+ String text = "\"\"\"";
+ InputAttributes attr = new InputAttributes();
+ TokenHierarchy<?> hi = TokenHierarchy.create(text, false,
JavaTokenId.language(), EnumSet.noneOf(JavaTokenId.class), attr);
+ TokenSequence<?> ts = hi.tokenSequence();
+
+ LexerTestUtilities.assertNextTokenEquals(ts,
JavaTokenId.STRING_LITERAL, "\"\"");
+ LexerTestUtilities.assertNextTokenEquals(ts,
JavaTokenId.STRING_LITERAL, "\"");
+ assertFalse(ts.moveNext());
+ }
+
+ public void testTrailing3() {
+ String text = "\"\"\" ";
+ InputAttributes attr = new InputAttributes();
+ TokenHierarchy<?> hi = TokenHierarchy.create(text, false,
JavaTokenId.language(), EnumSet.noneOf(JavaTokenId.class), attr);
+ TokenSequence<?> ts = hi.tokenSequence();
+
+ LexerTestUtilities.assertNextTokenEquals(ts,
JavaTokenId.STRING_LITERAL, "\"\"");
+ LexerTestUtilities.assertNextTokenEquals(ts,
JavaTokenId.STRING_LITERAL, "\" ");
+ assertFalse(ts.moveNext());
+ }
+
+ public void testTrailing4() {
+ String text = "\"\"\"\n";
+ InputAttributes attr = new InputAttributes();
+ TokenHierarchy<?> hi = TokenHierarchy.create(text, false,
JavaTokenId.language(), EnumSet.noneOf(JavaTokenId.class), attr);
+ TokenSequence<?> ts = hi.tokenSequence();
+
+ LexerTestUtilities.assertNextTokenEquals(ts,
JavaTokenId.MULTILINE_STRING_LITERAL, "\"\"\"\n");
+ assertFalse(ts.moveNext());
+ }
+
+ public void testTrailing5() {
+ String text = "\"\"\" \n";
+ InputAttributes attr = new InputAttributes();
+ TokenHierarchy<?> hi = TokenHierarchy.create(text, false,
JavaTokenId.language(), EnumSet.noneOf(JavaTokenId.class), attr);
+ TokenSequence<?> ts = hi.tokenSequence();
+
+ LexerTestUtilities.assertNextTokenEquals(ts,
JavaTokenId.MULTILINE_STRING_LITERAL, "\"\"\" \n");
+ assertFalse(ts.moveNext());
+ }
+
}
diff --git
a/java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
b/java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
index fa7bbb4..1b32e4a 100644
--- a/java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
+++ b/java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
@@ -568,26 +568,6 @@ public class SourceUtils {
return null;
}
- /**
- * @since 13.0
- */
- public static boolean isTextBlockSupported(
- @NullAllowed FileObject fileObject) {
- SpecificationVersion supportedVer = new SpecificationVersion("13");
//NOI18N
-
- SpecificationVersion runtimeVer = new
SpecificationVersion(System.getProperty("java.specification.version")); //NOI18N
- if (runtimeVer.compareTo(supportedVer) >= 0) {
- if (fileObject != null) {
- SpecificationVersion sourceVer = new
SpecificationVersion(SourceLevelQuery.getSourceLevel(fileObject));
- if (sourceVer.compareTo(supportedVer) < 0) {
- return false;
- }
- }
- return true;
- }
- return false;
- }
-
private static FileObject findSourceForBinary(FileObject binaryRoot,
FileObject binary, String signature, String pkgName, String className, boolean
isPkg) throws IOException {
FileObject[] sourceRoots =
SourceForBinaryQuery.findSourceRoots(binaryRoot.toURL()).getRoots();
ClassPath sourcePath = ClassPathSupport.createClassPath(sourceRoots);
diff --git
a/java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java
b/java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java
index 85f00fe..ada1ec2 100644
---
a/java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java
+++
b/java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java
@@ -103,7 +103,6 @@ import org.netbeans.api.java.source.CodeStyle;
import org.netbeans.api.java.source.CodeStyle.*;
import org.netbeans.api.java.source.Comment;
import org.netbeans.api.java.source.Comment.Style;
-import static org.netbeans.api.java.source.SourceUtils.isTextBlockSupported;
import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.modules.java.source.TreeShims;
@@ -1895,7 +1894,7 @@ public final class VeryPretty extends JCTree.Visitor
implements DocTreeVisitor<V
case CLASS:
if (tree.value instanceof String) {
print("\"" + quote((String) tree.value, '\'') + "\"");
- } else if (isTextBlockSupported(null) && tree.value instanceof
String[]) {
+ } else if (tree.value instanceof String[]) {
int indent = out.col;
print("\"\"\"");
newline();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
