Merge pull request #9 from mwillema/issue-9

Bad auto indent of closing bracket for embedded message

README.md

@@ -1,2 +1,16 @@
 # Protobuf NetBeans Plugin
 Netbeans IDE plugin to support Protocol Buffers
+
+## Installation
+
+### Installation via NetBeans Update Center
+The plugin is available at [http://plugins.netbeans.org/plugin/70658/](http://plugins.netbeans.org/plugin/70658/), and can be installed via the NetBeans Update Center automatically.
+
+### Manual Installation
+Make sure you don't have an old version installed.
+
+1. Download the [latest release](http://plugins.netbeans.org/plugin/70658/)
+3. Start Netbeans
+4. Select Tools -> Plugins -> Downloaded -> Add Plugins...
+5. Select the .nbm file
+6. Accept the license and the installation of self-signed plugins

protobuf-editor/manifest.mf

@@ -3,4 +3,4 @@ AutoUpdate-Show-In-Client: true
 OpenIDE-Module: com.marcowillemart.protobuf.editor
 OpenIDE-Module-Layer: com/marcowillemart/protobuf/editor/layer.xml
 OpenIDE-Module-Localizing-Bundle: com/marcowillemart/protobuf/editor/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0.0
+OpenIDE-Module-Specification-Version: 1.0.1

protobuf-editor/src/com/marcowillemart/common/lang/Line.java

@@ -38,6 +38,12 @@ public interface Line {
      */
     String text();
 
+    /**
+     * @return the indentation of this, i.e., the whitespaces in this.text
+     *         before the first non-white character.
+     */
+    String indentation();
+
     /**
      * @return true iff the last non-white character of this.text is a '{'
      */

protobuf-editor/src/com/marcowillemart/common/lang/SimpleLine.java

@@ -59,6 +59,19 @@ public String text() {
         return text;
     }
 
+    @Override
+    public String indentation() {
+        int i;
+
+        for (i = 0; i < text.length(); i++) {
+            if (!Character.isWhitespace(text.charAt(i))) {
+                break;
+            }
+        }
+
+        return text.substring(0, i);
+    }
+
     @Override
     public boolean isLastOpeningBrace() {
         for (int i = text.length() - 1; i >= 0; i--) {

protobuf-editor/src/com/marcowillemart/protobuf/editor/typinghooks/ProtobufTypedBreakInterceptor.java

@@ -37,7 +37,7 @@ public boolean beforeInsert(Context context) throws BadLocationException {
     public void insert(MutableContext context) throws BadLocationException {
         Document document = documentFrom(context);
 
-        addExtraLineBetweenBraces(context);
+        addExtraLineBetweenBraces(context, document);
         closeBlockComment(context, document);
         addLineToBlockComment(context, document);
     }
@@ -55,19 +55,24 @@ public void cancelled(Context context) {
     ////////////////////
 
     /**
-     * @requires context != null
+     * @requires context != null && document != null
      * @modifies context
      * @effects Adds an extra line if the line break is typed between two
      *          matching braces.
      */
-    private static void addExtraLineBetweenBraces(MutableContext context) {
+    private static void addExtraLineBetweenBraces(
+            MutableContext context,
+            Document document) {
+
         int offset = context.getBreakInsertOffset();
 
         if (0 < offset && offset < context.getDocument().getLength()) {
             String surroundingchars = surroundingCharacters(context, offset);
 
             if (PAIR_OF_CURLY_BRACES.equals(surroundingchars)) {
-                context.setText("\n\n", 1, 1);
+                String indentation = document.lineAt(offset).indentation();
+
+                context.setText(String.format("\n\n%s", indentation), 1, 1);
             }
         }
     }

protobuf-editor/test/unit/src/com/marcowillemart/common/lang/SimpleLineTest.java

@@ -0,0 +1,67 @@
+package com.marcowillemart.common.lang;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+/**
+ * Unit tests for the SimpleLine class.
+ *
+ * @author mwi
+ */
+public class SimpleLineTest {
+
+    private Line target;
+
+    @Test
+    public void testIndentation_none() {
+        // Setup
+        target = createLine("message M {}");
+
+        // Exercise & Verify
+        assertTrue(target.indentation().isEmpty());
+    }
+
+    @Test
+    public void testIndentation_space() {
+        // Setup
+        target = createLine("    message M {}");
+
+        // Exercise & Verify
+        assertEquals("    ", target.indentation());
+    }
+
+    @Test
+    public void testIndentation_tab() {
+        // Setup
+        target = createLine("\tmessage M {}");
+
+        // Exercise & Verify
+        assertEquals("\t", target.indentation());
+    }
+
+    @Test
+    public void testIndentation_emptyLine() {
+        // Setup
+        target = createLine("");
+
+        // Exercise & Verify
+        assertTrue(target.indentation().isEmpty());
+    }
+
+    @Test
+    public void testIndentation_onlyWhitespaces() {
+        // Setup
+        target = createLine("  \t  ");
+
+        // Exercise & Verify
+        assertEquals("  \t  ", target.indentation());
+    }
+
+    ////////////////////
+    // HELPER METHODS
+    ////////////////////
+
+    private static Line createLine(String text)  {
+        return new SimpleLine(1, 0, text.length(), text);
+    }
+}