You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2020/05/04 07:27:08 UTC
[netbeans] branch master updated: [NETBEANS-3973] Fixed double
space before lambda arrow
This is an automated email from the ASF dual-hosted git repository.
skygo 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 e5aab95 [NETBEANS-3973] Fixed double space before lambda arrow
new 02bea2d Merge pull request #2127 from mgraciano/NETBEANS-3973
e5aab95 is described below
commit e5aab95b7c6ec2aa6bd720c388a2a3056ecfa657
Author: Michel Graciano <mg...@apache.org>
AuthorDate: Sun May 3 14:17:38 2020 -0300
[NETBEANS-3973] Fixed double space before lambda arrow
---
.../org/netbeans/modules/java/source/save/Reformatter.java | 3 +--
.../org/netbeans/modules/java/source/save/FormatingTest.java | 12 ++++++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java b/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java
index 916ac4f..799e173 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java
@@ -2864,6 +2864,7 @@ public class Reformatter implements ReformatTask {
if(statements != null)
accept(COLON);
else {
+ space();
accept(ARROW);
caseBody = TreeShims.getBody(node);
if (caseBody instanceof StatementTree)
@@ -3468,8 +3469,6 @@ public class Reformatter implements ReformatTask {
? getIndent()
: after == 2 //after javadoc comment
? getNewlines(1) + getIndent()
- : id == ARROW
- ? SPACE
: null;
if (lastWSToken != null) {
if (spaces == null || !spaces.contentEquals(lastWSToken.text()))
diff --git a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java
index 613864a..fa1fd2e 100644
--- a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java
+++ b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java
@@ -46,6 +46,7 @@ import org.netbeans.junit.NbTestSuite;
import org.netbeans.modules.java.JavaDataLoader;
import org.netbeans.modules.java.source.BootClassPathUtil;
import org.netbeans.modules.java.source.usages.IndexUtil;
+import org.netbeans.modules.java.ui.FmtOptions;
import org.netbeans.spi.java.classpath.ClassPathProvider;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
import org.openide.cookies.EditorCookie;
@@ -4830,7 +4831,18 @@ public class FormatingTest extends NbTestCase {
+ " java.util.Arrays.asList(args).map((val) -> val.length());\n"
+ " }\n"
+ "}\n";
+ // Testing with wrapping lambda arrow deactivated
reformat(doc, content, golden);
+
+ final String wrapAfterLambdaArrow = FmtOptions.wrapAfterLambdaArrow;
+ Preferences preferences = MimeLookup.getLookup(JavaTokenId.language().mimeType()).lookup(Preferences.class);
+ preferences.putBoolean(wrapAfterLambdaArrow, true);
+
+ // Testing with wrapping lambda arrow activated
+ reformat(doc, content, golden);
+
+ // Returning the setting to the default value
+ preferences.putBoolean(wrapAfterLambdaArrow, FmtOptions.getDefaultAsBoolean(wrapAfterLambdaArrow));
}
public void testForNoCondition() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists