[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/actions PyBackspace.java,1.1,1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15928/src/org/python/pydev/editor/actions

Modified Files:
	PyBackspace.java 
Log Message:
Decoration support / Making correction assistant on Ctrl+1

Index: PyBackspace.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/PyBackspace.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyBackspace.java	16 Jul 2004 15:33:54 -0000	1.1
--- PyBackspace.java	24 Sep 2004 16:41:21 -0000	1.2
***************
*** 14,138 ****
  /**
   * @author Fabio Zadrozny
!  *
!  *	Makes a backspace happen... 
!  *
!  *	We can:
!  *	- go to the indentation from some uncommented previous line (if we only
!  *	  have whitespaces in the current line).
!  *
!  *	- erase all whitespace characters until we find some character.
!  *
!  *  - erase a single character. 
   */
! public class PyBackspace extends PyAction{
  
! 	/**
! 	 *	Makes a backspace happen... 
! 	 *
! 	 *	We can:
! 	 *	- go to the indentation from some uncommented previous line (if we only
! 	 *	  have whitespaces in the current line).
! 	 *
! 	 *	- erase all whitespace characters until we find some character.
! 	 *
! 	 *  - erase a single character. 
! 	 */
! 	public void run(IAction action) {
! 		// Select from text editor
! 	    PySelection ps = new PySelection ( getTextEditor ( ), false );
  
! 		// Perform the action
! 		try
! 		{   
! 		    ITextSelection textSelection = ps.getITextSelection();
  
! 		    if( textSelection.getLength() != 0){
! 		        eraseSelection(ps);
! 	            return ;
! 		    }
! 		    
! 		    int lastCharPosition = getLastCharPosition(ps.doc, ps.getCursorOffset());
! 		    
! 		    int cursorOffset = textSelection.getOffset();
! 		    
! 			IRegion lastCharRegion = ps.doc.getLineInformationOfOffset(lastCharPosition+1);
! 		    //System.out.println("cursorOffset: "+ cursorOffset);
! 		    //System.out.println("lastCharPosition: "+lastCharPosition);
! 		    //System.out.println("lastCharRegion.getOffset(): " +lastCharRegion.getOffset());
! //			IRegion cursorRegion = ps.doc.getLineInformationOfOffset(cursorOffset);
! 			
! 		    if( cursorOffset == lastCharRegion.getOffset()){
! 		        //System.out.println("We are in the beggining of the line.");
! 		        //in this situation, we are in the first character of the line...
! 		        //so, we have to get the end of the other line and delete it.
! 		        if (cursorOffset != 0) //we only want to erase if we are not in the first line.
! 		            eraseLineDelimiter(ps);
! 		    }
! 			else if(cursorOffset <= lastCharPosition){
! 			    //System.out.println("cursorOffset <= lastCharPosition");
! 			    //this situation is:
! 			    //    |a   (delete to previous indentation - considers cursor position)
! 			    //or
! 			    //    as | as (delete single char)
! 			    //or 
! 			    //  |    a  (delete to previous indentation - considers cursor position)
! 			    //so, we have to treat it carefully
! 			    eraseToPreviousIndentation(ps,false);
! 			}
! 			else if(lastCharRegion.getOffset() == lastCharPosition+1){
! 			    //System.out.println("Only whitespaces in the line.");
! 			    //in this situation, this line only has whitespaces,
! 			    //so, we have to erase depending on the previous indentation.
! 			    eraseToPreviousIndentation(ps,true);
! 			}else{
! 			    
! 			    if (cursorOffset - lastCharPosition == 1){
! 			        //System.out.println("Erase single char.");
! 					//last char and cursor are in the same line.
! 				    //this situation is:
! 				    //    a|
! 			        eraseSingleChar(ps);
! 			    
! 			    }else if (cursorOffset - lastCharPosition > 1){
! 				    //this situation is:
! 				    //    a    |
! 			        //System.out.println("Erase until last char is found.");
! 			        eraseUntilLastChar(ps,lastCharPosition);
! 			    } 
! 			}
! 		}
! 		catch ( Exception e )
! 		{
! 			beep ( e );
! 		}
!         
!     }
  
  
! 	/**
       * @param ps
! 	 * @param hasOnlyWhitespaces
! 	 * @throws BadLocationException
       */
!     private void eraseToPreviousIndentation(PySelection ps, boolean hasOnlyWhitespaces) throws BadLocationException {
          ITextSelection textSelection = ps.getITextSelection();
!         int indentation = getPreviousIndentation(ps,textSelection);
!         if(indentation == -1){
              //System.out.println("erasing single char");
              eraseSingleChar(ps);
!         }else{
!             if(hasOnlyWhitespaces){
                  //System.out.println("only whitespaces");
                  eraseToIndentation(ps, indentation);
!             }else{
                  //System.out.println("not only whitespaces");
! 			    //this situation is:
! 			    //    |a   (delete to previous indentation - considers cursor position)
! 			    //or
! 			    //    as | as (delete single char)
! 			    //or 
! 			    //  |    a  (delete to previous indentation - considers cursor position)
! 			    //so, we have to treat it carefully
!                 //TODO: use the conditions above and not just erase a single char.
  
                  eraseSingleChar(ps);
--- 14,136 ----
  /**
   * @author Fabio Zadrozny
!  * 
!  * Makes a backspace happen...
!  * 
!  * We can: - go to the indentation from some uncommented previous line (if we
!  * only have whitespaces in the current line).
!  *  - erase all whitespace characters until we find some character.
!  *  - erase a single character.
   */
! public class PyBackspace extends PyAction {
  
!     /**
!      * Makes a backspace happen...
!      * 
!      * We can: - go to the indentation from some uncommented previous line (if
!      * we only have whitespaces in the current line).
!      *  - erase all whitespace characters until we find some character.
!      *  - erase a single character.
!      */
!     public void run(IAction action) {
!         // Select from text editor
!         PySelection ps = new PySelection(getTextEditor(), false);
  
!         // Perform the action
!         try {
!             ITextSelection textSelection = ps.getITextSelection();
  
!             if (textSelection.getLength() != 0) {
!                 eraseSelection(ps);
!                 return;
!             }
  
+             int lastCharPosition = getLastCharPosition(ps.doc, ps.getCursorOffset());
  
!             int cursorOffset = textSelection.getOffset();
! 
!             IRegion lastCharRegion = ps.doc.getLineInformationOfOffset(lastCharPosition + 1);
!             //System.out.println("cursorOffset: "+ cursorOffset);
!             //System.out.println("lastCharPosition: "+lastCharPosition);
!             //System.out.println("lastCharRegion.getOffset(): "
!             // +lastCharRegion.getOffset());
!             //			IRegion cursorRegion =
!             // ps.doc.getLineInformationOfOffset(cursorOffset);
! 
!             if (cursorOffset == lastCharRegion.getOffset()) {
!                 //System.out.println("We are in the beggining of the line.");
!                 //in this situation, we are in the first character of the
!                 // line...
!                 //so, we have to get the end of the other line and delete it.
!                 if (cursorOffset != 0) //we only want to erase if we are not in
!                                        // the first line.
!                     eraseLineDelimiter(ps);
!             } else if (cursorOffset <= lastCharPosition) {
!                 //System.out.println("cursorOffset <= lastCharPosition");
!                 //this situation is:
!                 //    |a (delete to previous indentation - considers cursor
!                 // position)
!                 //or
!                 //    as | as (delete single char)
!                 //or
!                 //  | a (delete to previous indentation - considers cursor
!                 // position)
!                 //so, we have to treat it carefully
!                 eraseToPreviousIndentation(ps, false);
!             } else if (lastCharRegion.getOffset() == lastCharPosition + 1) {
!                 //System.out.println("Only whitespaces in the line.");
!                 //in this situation, this line only has whitespaces,
!                 //so, we have to erase depending on the previous indentation.
!                 eraseToPreviousIndentation(ps, true);
!             } else {
! 
!                 if (cursorOffset - lastCharPosition == 1) {
!                     //System.out.println("Erase single char.");
!                     //last char and cursor are in the same line.
!                     //this situation is:
!                     //    a|
!                     eraseSingleChar(ps);
! 
!                 } else if (cursorOffset - lastCharPosition > 1) {
!                     //this situation is:
!                     //    a |
!                     //System.out.println("Erase until last char is found.");
!                     eraseUntilLastChar(ps, lastCharPosition);
!                 }
!             }
!         } catch (Exception e) {
!             beep(e);
!         }
! 
!     }
! 
!     /**
       * @param ps
!      * @param hasOnlyWhitespaces
!      * @throws BadLocationException
       */
!     private void eraseToPreviousIndentation(PySelection ps, boolean hasOnlyWhitespaces)
!             throws BadLocationException {
          ITextSelection textSelection = ps.getITextSelection();
!         int indentation = getPreviousIndentation(ps, textSelection.getStartLine());
!         if (indentation == -1) {
              //System.out.println("erasing single char");
              eraseSingleChar(ps);
!         } else {
!             if (hasOnlyWhitespaces) {
                  //System.out.println("only whitespaces");
                  eraseToIndentation(ps, indentation);
!             } else {
                  //System.out.println("not only whitespaces");
!                 //this situation is:
!                 //    |a (delete to previous indentation - considers cursor
!                 // position)
!                 //or
!                 //    as | as (delete single char)
!                 //or
!                 //  | a (delete to previous indentation - considers cursor
!                 // position)
!                 //so, we have to treat it carefully
!                 //TODO: use the conditions above and not just erase a single
!                 // char.
  
                  eraseSingleChar(ps);
***************
*** 145,161 ****
       * @param ps
       * @param textSelection
!      * @return offset of the indentation on the previous non-commented line or -1
!      *         if we are not able to get it (if this happens, we delete 1 char).
       * @throws BadLocationException
       */
!     private int getPreviousIndentation(PySelection ps, ITextSelection textSelection) throws BadLocationException {
!         int currentLine = textSelection.getStartLine();
!         if(currentLine == 0){
!             //we are in the first line, so, we have no basis to get indentation.
              return -1;
!         }else{
!             for (int i = currentLine-1; i >=0 ; i++) {
                  int currentLineOffset = ps.doc.getLineOffset(i);
!                 if(ps.doc.getChar(currentLineOffset+1) != '#'){
                      int currentLineFirstCharPos = getFirstCharRelativePosition(ps.doc, currentLineOffset);
                      return currentLineFirstCharPos;
--- 143,160 ----
       * @param ps
       * @param textSelection
!      * @return offset of the indentation on the previous non-commented line or
!      *         -1 if we are not able to get it (if this happens, we delete 1
!      *         char).
       * @throws BadLocationException
       */
!     private static int getPreviousIndentation(PySelection ps, int currentLine) throws BadLocationException {
!         if (currentLine == 0) {
!             //we are in the first line, so, we have no basis to get
!             // indentation.
              return -1;
!         } else {
!             for (int i = currentLine - 1; i >= 0; i++) {
                  int currentLineOffset = ps.doc.getLineOffset(i);
!                 if (ps.doc.getChar(currentLineOffset + 1) != '#') {
                      int currentLineFirstCharPos = getFirstCharRelativePosition(ps.doc, currentLineOffset);
                      return currentLineFirstCharPos;
***************
*** 166,170 ****
      }
  
- 
      /**
       * 
--- 165,168 ----
***************
*** 172,181 ****
       * @throws BadLocationException
       */
!     private void eraseSingleChar(PySelection ps) throws BadLocationException{
! 	    ITextSelection textSelection = ps.getITextSelection();
! 	    
! 	    ps.doc.replace ( textSelection.getOffset() -1, 1, "" );
! 	}
! 	
      /**
       * 
--- 170,179 ----
       * @throws BadLocationException
       */
!     private void eraseSingleChar(PySelection ps) throws BadLocationException {
!         ITextSelection textSelection = ps.getITextSelection();
! 
!         ps.doc.replace(textSelection.getOffset() - 1, 1, "");
!     }
! 
      /**
       * 
***************
*** 183,282 ****
       * @throws BadLocationException
       */
! 	private void eraseLineDelimiter(PySelection ps) throws BadLocationException{
  
! 	    ITextSelection textSelection = ps.getITextSelection();
! 	    
! 	    int length = getDelimiter(ps.doc, 1).length();
! 	    int offset = textSelection.getOffset() - length;
  
! 	    //System.out.println("Replacing offset: "+(offset) +" lenght: "+ (length));
! 	    ps.doc.replace ( offset, length, "" );
! 	}
! 	
! 	/**
! 	 * 
! 	 * @param ps
! 	 * @throws BadLocationException
! 	 */
! 	private void eraseSelection(PySelection ps) throws BadLocationException{
! 	    ITextSelection textSelection = ps.getITextSelection();
! 	    
! 	    ps.doc.replace ( textSelection.getOffset() , textSelection.getLength(), "" );
! 	}
  
! 	/**
       * @param ps
! 	 * @param lastCharPosition
! 	 * @throws BadLocationException
       */
!     private void eraseUntilLastChar(PySelection ps, int lastCharPosition) throws BadLocationException {
! 	    ITextSelection textSelection = ps.getITextSelection();
! 	    int cursorOffset = textSelection.getOffset();
! 	    
! 	    int offset = lastCharPosition+1;
! 	    int length = cursorOffset - lastCharPosition-1;
! 	    //System.out.println("Replacing offset: "+(offset) +" lenght: "+ (length));
! 	    ps.doc.replace ( offset , length, "" );
      }
  
  
      /**
!      * TODO: Make use of the indentation gotten previously. This implementation just
!      * uses the indentation string and erases the number of chars from it.
       * 
       * @param ps
!      * @param indentation - this is in number of characters.
       * @throws BadLocationException
       */
      private void eraseToIndentation(PySelection ps, int indentation) throws BadLocationException {
! 	    ITextSelection textSelection = ps.getITextSelection();
! 	    int cursorOffset = textSelection.getOffset();
!         
! 	    String indentationString = getIndentationString();
! 	    int length = indentationString.length();
! 	    int offset = cursorOffset - length;
! 	    
! 	    IRegion region = ps.doc.getLineInformationOfOffset(cursorOffset);
! 	    int dif = region.getOffset() - offset;
! 	    //System.out.println("dif = "+dif);
! 	    if (dif > 0){
! 	        offset += dif;
! 	        length -= dif;
! 	    }
! 	    //we have to be careful not to erase more than the current line.
!         //System.out.println("Replacing offset: "+(offset) +" lenght: "+ (length));
! 	    ps.doc.replace ( offset , length, "" );
!     }
  
  
      //CODE BELOW GOTTEN FROM PyAutoIndentStrategy.java.
      //TODO: Software enginner this (Ctrl-C / Ctrl-V is not a good strategy)
! 	String identString = null;
! 	//	should tab be converted to spaces?
! 	boolean useSpaces = PydevPrefs.getPreferences().getBoolean(PydevPrefs.SUBSTITUTE_TABS);	
! 	int tabWidth = PydevPrefs.getPreferences().getInt(PydevPrefs.TAB_WIDTH);
! 	boolean forceTabs = false;
  
! 	private String createSpaceString(int width) {
! 		StringBuffer b = new StringBuffer(width);
! 						while (tabWidth-- > 0)
! 							b.append(" ");
! 		return b.toString();
! 	}
  
! 	private String getIndentationString() {
! 		if (identString == null ||
! 			tabWidth != PydevPrefs.getPreferences().getInt(PydevPrefs.TAB_WIDTH) ||
! 			useSpaces != PydevPrefs.getPreferences().getBoolean(PydevPrefs.SUBSTITUTE_TABS))
! 		{
! 			tabWidth = PydevPrefs.getPreferences().getInt(PydevPrefs.TAB_WIDTH);
! 			useSpaces = PydevPrefs.getPreferences().getBoolean(PydevPrefs.SUBSTITUTE_TABS);
! 			if (useSpaces && !forceTabs)
! 				identString = createSpaceString(tabWidth);
! 			else
! 				identString = "\t";
! 		}
! 		return identString;
! 	}
! 	//END TODO.
! }
--- 181,312 ----
       * @throws BadLocationException
       */
!     private void eraseLineDelimiter(PySelection ps) throws BadLocationException {
  
!         ITextSelection textSelection = ps.getITextSelection();
  
!         int length = getDelimiter(ps.doc, 1).length();
!         int offset = textSelection.getOffset() - length;
  
!         //System.out.println("Replacing offset: "+(offset) +" lenght: "+
!         // (length));
!         ps.doc.replace(offset, length, "");
!     }
! 
!     /**
!      * 
       * @param ps
!      * @throws BadLocationException
       */
!     private void eraseSelection(PySelection ps) throws BadLocationException {
!         ITextSelection textSelection = ps.getITextSelection();
! 
!         ps.doc.replace(textSelection.getOffset(), textSelection.getLength(), "");
      }
  
+     /**
+      * @param ps
+      * @param lastCharPosition
+      * @throws BadLocationException
+      */
+     private void eraseUntilLastChar(PySelection ps, int lastCharPosition) throws BadLocationException {
+         ITextSelection textSelection = ps.getITextSelection();
+         int cursorOffset = textSelection.getOffset();
+ 
+         int offset = lastCharPosition + 1;
+         int length = cursorOffset - lastCharPosition - 1;
+         //System.out.println("Replacing offset: "+(offset) +" lenght: "+
+         // (length));
+         ps.doc.replace(offset, length, "");
+     }
  
      /**
!      * TODO: Make use of the indentation gotten previously. This implementation
!      * just uses the indentation string and erases the number of chars from it.
       * 
       * @param ps
!      * @param indentation -
!      *            this is in number of characters.
       * @throws BadLocationException
       */
      private void eraseToIndentation(PySelection ps, int indentation) throws BadLocationException {
!         ITextSelection textSelection = ps.getITextSelection();
!         int cursorOffset = textSelection.getOffset();
  
+         String indentationString = getIndentationString();
+         int length = indentationString.length();
+         int offset = cursorOffset - length;
+ 
+         IRegion region = ps.doc.getLineInformationOfOffset(cursorOffset);
+         int dif = region.getOffset() - offset;
+         //System.out.println("dif = "+dif);
+         if (dif > 0) {
+             offset += dif;
+             length -= dif;
+         }
+         //we have to be careful not to erase more than the current line.
+         //System.out.println("Replacing offset: "+(offset) +" lenght: "+
+         // (length));
+         ps.doc.replace(offset, length, "");
+     }
  
      //CODE BELOW GOTTEN FROM PyAutoIndentStrategy.java.
      //TODO: Software enginner this (Ctrl-C / Ctrl-V is not a good strategy)
!     String identString = null;
  
!     //	should tab be converted to spaces?
!     boolean useSpaces = PydevPrefs.getPreferences().getBoolean(PydevPrefs.SUBSTITUTE_TABS);
  
!     int tabWidth = PydevPrefs.getPreferences().getInt(PydevPrefs.TAB_WIDTH);
! 
!     boolean forceTabs = false;
! 
!     private String createSpaceString(int width) {
!         StringBuffer b = new StringBuffer(width);
!         while (tabWidth-- > 0)
!             b.append(" ");
!         return b.toString();
!     }
! 
!     /**
!      * 
!      * @return indentation string (from cache)
!      */
!     private String getIndentationString() {
!         if (identString == null || tabWidth != PydevPrefs.getPreferences().getInt(PydevPrefs.TAB_WIDTH)
!                 || useSpaces != PydevPrefs.getPreferences().getBoolean(PydevPrefs.SUBSTITUTE_TABS)) {
!             tabWidth = PydevPrefs.getPreferences().getInt(PydevPrefs.TAB_WIDTH);
!             useSpaces = PydevPrefs.getPreferences().getBoolean(PydevPrefs.SUBSTITUTE_TABS);
!             if (useSpaces && !forceTabs)
!                 identString = createSpaceString(tabWidth);
!             else
!                 identString = "\t";
!         }
!         return identString;
!     }
!     //END TODO.
! 
! 
!     private static String createStaticSpaceString(int width, int tabWidth) {
!         StringBuffer b = new StringBuffer(width);
!         while (tabWidth-- > 0)
!             b.append(" ");
!         return b.toString();
!     }
! 
!     /**
!      * 
!      * @return indentation string (always recreated) 
!      */
!     public static String getStaticIndentationString() {
!         int tabWidth = PydevPrefs.getPreferences().getInt(PydevPrefs.TAB_WIDTH);
!         boolean useSpaces = PydevPrefs.getPreferences().getBoolean(PydevPrefs.SUBSTITUTE_TABS);
!         boolean forceTabs = false;
!         String identString;
! 
!         if (useSpaces && !forceTabs)
!             identString = createStaticSpaceString(tabWidth, tabWidth);
!         else
!             identString = "\t";
!         return identString;
!     }
! }
\ No newline at end of file