[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6662] trunk/sql12

[<ger...@us...>]

Revision: 6662
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6662&view=rev
Author:   gerdwagner
Date:     2012-09-25 19:11:38 +0000 (Tue, 25 Sep 2012)
Log Message:
-----------
Code completion: When selecting a completion by tab, overwriting of subsequent characters does not stop
  only at the next white space but also at .,'();" characters.

Modified Paths:
--------------
    trunk/sql12/doc/src/main/resources/changes.txt
    trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CompleteCodeAction.java

Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt	2012-09-25 19:06:16 UTC (rev 6661)
+++ trunk/sql12/doc/src/main/resources/changes.txt	2012-09-25 19:11:38 UTC (rev 6662)
@@ -6,6 +6,8 @@
 Not yet released, available in our Subversion repository and in future snapshots and releases.
 ===============================================================================================
 
+Enhancements:
+
 Overview tab: Now has a button to copy a HTML-report of an overview to clipboard
 
 Abbreviation/Auto-correction now works also if it is placed right after an opening bracket.
@@ -23,6 +25,12 @@
 dandar3 for the tip. 
 
 
+Bug fixes:
+
+Code completion: When selecting a completion by tab, overwriting of subsequent characters does not stop
+  only at the next white space but also at .,'();" characters.
+
+
 3.4.0 (8/6/2012)
 ==================
 

Modified: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CompleteCodeAction.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CompleteCodeAction.java	2012-09-25 19:06:16 UTC (rev 6661)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CompleteCodeAction.java	2012-09-25 19:11:38 UTC (rev 6662)
@@ -114,7 +114,7 @@
       else if(KeyEvent.VK_TAB == keyCode)
 		{
 			_sqlEntryPanel.setSelectionStart(replaceBegin);
-			_sqlEntryPanel.setSelectionEnd(getNextWhiteSpacePos(_sqlEntryPanel.getCaretPosition()));
+			_sqlEntryPanel.setSelectionEnd(getNextStopCharPos(_sqlEntryPanel.getCaretPosition()));
 			_sqlEntryPanel.replaceSelection(completion.getCompletionString());
          adjustCaret(completion);
 		}
@@ -136,7 +136,7 @@
       }
    }
 
-   private int getNextWhiteSpacePos(int startPos)
+   private int getNextStopCharPos(int startPos)
 	{
 		String text = _sqlEntryPanel.getText();
 
@@ -144,7 +144,8 @@
 
 		for(;retPos < text.length(); ++retPos)
 		{
-			if(Character.isWhitespace(text.charAt(retPos)))
+         char c = text.charAt(retPos);
+         if(Character.isWhitespace(c) || '.' == c || ',' == c || ';' == c || '"' == c || '\'' == c || '(' == c || ')' == c)
 			{
 				return retPos;
 			}

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