Fix for #1093: don't smart insert '{' after comma or colon

groovy · May 5, 2020 · 02f56b5 · 02f56b5
1 parent 04b3545
commit 02f56b5
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/...haus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/ui/SmartInsertTests.groovy b/...haus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/ui/SmartInsertTests.groovy
@@ -51,7 +51,23 @@ final class SmartInsertTests extends GroovyEditorTestSuite {
 
         send('{')
 
-        assertEditorContents("new C(1, 2, ) {${CARET}") // TODO
+        assertEditorContents("new C(1, 2, {${CARET})")
+    }
+
+    @Test
+    void testInsertCurlyBrace3() {
+        addGroovySource '''\
+            |class C {
+            |  def setX(x) {
+            |  }
+            |}
+            |'''.stripMargin()
+
+        makeEditor("new C(x: ${CARET})")
+
+        send('{')
+
+        assertEditorContents("new C(x: {${CARET})")
     }
 
     //

diff --git a/...odehaus.groovy.eclipse.ui/src/org/codehaus/groovy/eclipse/editor/GroovyConfiguration.java b/...odehaus.groovy.eclipse.ui/src/org/codehaus/groovy/eclipse/editor/GroovyConfiguration.java
@@ -38,6 +38,7 @@
 import org.eclipse.jdt.ui.text.IJavaPartitions;
 import org.eclipse.jdt.ui.text.JavaSourceViewerConfiguration;
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IAutoEditStrategy;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.contentassist.ContentAssistant;
@@ -58,7 +59,7 @@ public class GroovyConfiguration extends JavaSourceViewerConfiguration {
     public GroovyConfiguration(final GroovyColorManager colorManager, final IPreferenceStore preferenceStore, final ITextEditor editor) {
         super(colorManager, preferenceStore, editor, IJavaPartitions.JAVA_PARTITIONING);
 
-        // replace Java's string scanner to enable Groovy's color choice
+        // replace Java's string scanner to enable Groovy's color choices
         AbstractJavaScanner stringScanner = new SingleTokenJavaScanner(colorManager,
             PreferenceConstants.getPreferenceStore(), PreferenceConstants.GROOVY_EDITOR_HIGHLIGHT_STRINGS_COLOR);
         ReflectionUtils.setPrivateField(JavaSourceViewerConfiguration.class, "fStringScanner", this, stringScanner);
@@ -109,6 +110,21 @@ public IAutoEditStrategy[] getAutoEditStrategies(final ISourceViewer sourceViewe
                     };
                     strategies = (IAutoEditStrategy[]) ArrayUtils.add(strategies, (IAutoEditStrategy) (document, command) -> {
                         if ("{".equals(command.text)) {
+                            //int offset = SmartSemicolonAutoEditStrategy.firstNonWhitespaceBackward(document, command.offset-1, partitioning, -1);
+                            Integer prev = ReflectionUtils.executePrivateMethod(SmartSemicolonAutoEditStrategy.class, "firstNonWhitespaceBackward",
+                                new Class[] {IDocument.class, int.class, String.class, int.class}, SmartSemicolonAutoEditStrategy.class,
+                                new Object[] {document, command.offset - 1, partitioning, -1});
+                            try {
+                                if (prev != null && prev != -1) {
+                                    switch (document.getChar(prev)) {
+                                    case ',':
+                                    case ':':
+                                        return;
+                                    }
+                                }
+                            } catch (BadLocationException ignore) {
+                            }
+
                             IAutoEditStrategy delegate = new SmartSemicolonAutoEditStrategy(partitioning);
                             delegate.customizeDocumentCommand(document, command);
                         }