[ jEdit-commits ] SF.net SVN: jedit:[20017] jEdit/trunk

[<ev...@us...>]

Revision: 20017
          http://jedit.svn.sourceforge.net/jedit/?rev=20017&view=rev
Author:   evanpw
Date:     2011-09-24 13:09:51 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
Added support for the newline character in electricKeys

Modified Paths:
--------------
    jEdit/trunk/doc/CHANGES.txt
    jEdit/trunk/doc/users-guide/writing-modes.xml
    jEdit/trunk/modes/shellscript.xml
    jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java

Modified: jEdit/trunk/doc/CHANGES.txt
===================================================================
--- jEdit/trunk/doc/CHANGES.txt	2011-09-24 12:18:28 UTC (rev 20016)
+++ jEdit/trunk/doc/CHANGES.txt	2011-09-24 13:09:51 UTC (rev 20017)
@@ -384,6 +384,8 @@
 
 - Added coffee edit mode (patch #3173375 from Dennis Hotson, Matthieu Casanova)
 
+- Added support for the newline character in electricKeys (Evan Wright)
+
 }}}
 {{{ UI
 

Modified: jEdit/trunk/doc/users-guide/writing-modes.xml
===================================================================
--- jEdit/trunk/doc/users-guide/writing-modes.xml	2011-09-24 12:18:28 UTC (rev 20016)
+++ jEdit/trunk/doc/users-guide/writing-modes.xml	2011-09-24 13:09:51 UTC (rev 20017)
@@ -186,7 +186,12 @@
     }</programlisting>
             </listitem>
             <listitem><para>
-             <literal>electricKeys</literal>: characters listed here, when typed on a line, cause the current line to be re-indented. </para></listitem>
+             <literal>electricKeys</literal>: characters listed here, when typed
+             on a line, cause the current line to be re-indented. Notice that by
+             default, pressing "Enter" does not re-indent the current line, only
+             the new line. To get this behavior, add the newline character to
+             <literal>electricKeys</literal> in the xml-escaped form &amp;#xA;
+             </para></listitem>
         </itemizedlist>
         <para>Here is the complete <literal>&lt;PROPS&gt;</literal> tag for Java
         mode:</para>

Modified: jEdit/trunk/modes/shellscript.xml
===================================================================
--- jEdit/trunk/modes/shellscript.xml	2011-09-24 12:18:28 UTC (rev 20016)
+++ jEdit/trunk/modes/shellscript.xml	2011-09-24 13:09:51 UTC (rev 20017)
@@ -13,7 +13,7 @@
 			VALUE="^\s*(fi|else|done|esac|[^(]*\).*)\s*(#.*)?$" />
 		<PROPERTY NAME="unindentNextLines"
 			VALUE="^\s*(fi|else|done|esac)\s*(#.*)?$" />
-		<PROPERTY NAME="electricKeys" VALUE=")" />
+		<PROPERTY NAME="electricKeys" VALUE=")&#xA;" />
 	</PROPS>
 	<RULES IGNORE_CASE="TRUE" HIGHLIGHT_DIGITS="TRUE" ESCAPE="\">
 		<!-- Comments -->

Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java	2011-09-24 12:18:28 UTC (rev 20016)
+++ jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java	2011-09-24 13:09:51 UTC (rev 20017)
@@ -4432,6 +4432,11 @@
 			getToolkit().beep();
 		else
 		{
+			if (buffer.isElectricKey('\n', caretLine))
+			{
+				buffer.indentLine(caretLine, true);
+			}
+			
 			try
 			{
 				buffer.beginCompoundEdit();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.