rubyeclipse-commit — Every CVS commit creates a post to this list.

[Rubyeclipse-commit] org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser RdtPositionFactory.java,1.2,1.3 MarkerUtility.java,1.6,1.7 RdtPosition.java,1.2,1.3

[Zach D. <zd...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6438/src/org/rubypeople/rdt/internal/core/parser

Modified Files:
	RdtPositionFactory.java MarkerUtility.java RdtPosition.java 
Log Message:
Updated for new jruby changes in regards to start and stop line positions for ruby classes, methods, variables, etc...

Index: RdtPositionFactory.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/RdtPositionFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RdtPositionFactory.java	2 Mar 2005 00:54:04 -0000	1.2
--- RdtPositionFactory.java	6 Aug 2005 02:46:18 -0000	1.3
***************
*** 25,35 ****
  	 */
  	public ISourcePosition getPosition(LexerSource source, ISourcePosition startPosition) {
! 		int start = 0;
! //		int line = 1;
! 		if(startPosition != null) {
! 			start = startPosition.getEndOffset();
! //			line = startPosition.getLine();
  		}
- 		return new RdtPosition(source.getLine(), start, source.getOffset());
  	}
  
--- 25,44 ----
  	 */
  	public ISourcePosition getPosition(LexerSource source, ISourcePosition startPosition) {
! 		int startOffset = 0;
! 		
! 		/* If startPosition is null then we are starting a new block/token of
! 		 * ruby code. */
! 		if( startPosition == null ){
! 			return new RdtPosition( source.getLine(), startOffset+1, 
! 					source.getOffset() ); }
! 		
! 		/* If startPosition isn't null then we are closing an existing
! 		 * block/token of ruby code, and the source.getLine() is the line that 
! 		 * the block/token of ruby code ends on.*/
! 		else{
! 			startOffset = startPosition.getEndOffset();
! 			return new RdtPosition( startPosition.getStartLine(), 
! 					source.getLine(), startOffset, source.getOffset() );
  		}
  	}
  

Index: MarkerUtility.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/MarkerUtility.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MarkerUtility.java	16 Jul 2005 22:26:30 -0000	1.6
--- MarkerUtility.java	6 Aug 2005 02:46:18 -0000	1.7
***************
*** 38,42 ****
  			map.put(IMarker.MESSAGE, syntaxException.getMessage());
  			map.put(IMarker.USER_EDITABLE, Boolean.FALSE);
! 			map.put(IMarker.LINE_NUMBER, new Integer(pos.getLine()));
  			map.put(IMarker.CHAR_START, new Integer(pos.getStartOffset()));
  			map.put(IMarker.CHAR_END, new Integer(pos.getEndOffset()));
--- 38,42 ----
  			map.put(IMarker.MESSAGE, syntaxException.getMessage());
  			map.put(IMarker.USER_EDITABLE, Boolean.FALSE);
! 			map.put(IMarker.LINE_NUMBER, new Integer(pos.getStartLine()));
  			map.put(IMarker.CHAR_START, new Integer(pos.getStartOffset()));
  			map.put(IMarker.CHAR_END, new Integer(pos.getEndOffset()));

Index: RdtPosition.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/RdtPosition.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RdtPosition.java	2 Mar 2005 00:54:04 -0000	1.2
--- RdtPosition.java	6 Aug 2005 02:46:18 -0000	1.3
***************
*** 12,29 ****
   **/
  public class RdtPosition implements ISourcePosition {
  	
! 	private int start;
! 	private int end;
! 	private int line;
  
  	/**
  	 * 
  	 */
! 	public RdtPosition(int line, int startOffset, int endOffset) {
! 		this.line = line;
! 		this.start = startOffset;
! 		this.end = endOffset;
! 	}
! 	
  	/* (non-Javadoc)
  	 * @see org.jruby.lexer.yacc.ISourcePosition#getFile()
--- 12,39 ----
   **/
  public class RdtPosition implements ISourcePosition {
+ 
+ 	private int startLine;
+ 	private int endLine;
  	
! 	private int startOffset;
! 	private int endOffset;
! 	
! 	public RdtPosition( int startLine, int startOffset, int endOffset ){
! 		this.startLine = startLine;
! 		this.endLine = startLine;
! 		this.startOffset = startOffset;
! 		this.endOffset = endOffset; 		
! 	}
  
  	/**
  	 * 
  	 */
! 	public RdtPosition( int startLine, int endLine, int startOffset, 
! 			int endOffset ){
! 		this.startLine = startLine;
! 		this.endLine = endLine;
! 		this.startOffset = startOffset;
! 		this.endOffset = endOffset; }
! 		
  	/* (non-Javadoc)
  	 * @see org.jruby.lexer.yacc.ISourcePosition#getFile()
***************
*** 33,42 ****
  	}
  
- 	/* (non-Javadoc)
- 	 * @see org.jruby.lexer.yacc.ISourcePosition#getLine()
- 	 */
- 	public int getLine() {
- 		return line;
- 	}
  
  	/* (non-Javadoc)
--- 43,46 ----
***************
*** 44,48 ****
  	 */
  	public int getStartOffset() {
! 		return start;
  	}
  
--- 48,52 ----
  	 */
  	public int getStartOffset() {
! 		return startOffset;
  	}
  
***************
*** 51,55 ****
  	 */
  	public int getEndOffset() {
! 		return end;
  	}
  
--- 55,59 ----
  	 */
  	public int getEndOffset() {
! 		return endOffset;
  	}
  
***************
*** 59,63 ****
  	 */
  	public String toString() {
! 		return "line " + getLine() + ": (" + getStartOffset() +".." + getEndOffset() + ")";
  	}
  	
--- 63,78 ----
  	 */
  	public String toString() {
! 		return "start line: " + getStartLine() + ", end line: " + getEndLine()
! 			+ ", (" + getStartOffset() + ".." + getEndOffset() + ")";
! 	}
! 
! 	public int getStartLine() {
! 		// TODO Auto-generated method stub
! 		return startLine;
! 	}
! 
! 	public int getEndLine() {
! 		// TODO Auto-generated method stub
! 		return endLine;
  	}
  	

[Rubyeclipse-commit] org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser DefaultProblem.java,1.2,1.3

[Zach D. <zd...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6397/src/org/rubypeople/rdt/internal/core/parser

Modified Files:
	DefaultProblem.java 
Log Message:
Updated for new jruby changes in regards to start and stop line positions for ruby classes, methods, variables, etc...

Index: DefaultProblem.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/DefaultProblem.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DefaultProblem.java	5 Mar 2005 16:05:15 -0000	1.2
--- DefaultProblem.java	6 Aug 2005 02:45:57 -0000	1.3
***************
*** 40,44 ****
  
  	public int getSourceLineNumber() {
! 		return position.getLine();
  	}
  
--- 40,44 ----
  
  	public int getSourceLineNumber() {
! 		return position.getStartLine();
  	}
  

[Rubyeclipse-commit] org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core RubyScriptStructureBuilder.java,1.8,1.9

[Zach D. <zd...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6286/src/org/rubypeople/rdt/internal/core

Modified Files:
	RubyScriptStructureBuilder.java 
Log Message:
Updates source positioning for Outline view. 

Index: RubyScriptStructureBuilder.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptStructureBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RubyScriptStructureBuilder.java	12 Jul 2005 00:03:06 -0000	1.8
--- RubyScriptStructureBuilder.java	6 Aug 2005 02:44:59 -0000	1.9
***************
*** 351,355 ****
  		info.setTypeName(estimateValueType(iVisited.getValueNode()));
  		ISourcePosition pos = iVisited.getPosition();
! 		setTokenRange(pos, info, name);
  		// TODO Add more information about the variable
  		infoStack.push(info);
--- 351,356 ----
  		info.setTypeName(estimateValueType(iVisited.getValueNode()));
  		ISourcePosition pos = iVisited.getPosition();
! 		//setTokenRange(pos, info, name);
! 		setClassVarRange( pos, info, name );
  		// TODO Add more information about the variable
  		infoStack.push(info);
***************
*** 370,381 ****
  	public void visitClassVarDeclNode(ClassVarDeclNode iVisited) {
  		handleNode(iVisited);
  		RubyElement type = getCurrentType();
  		RubyClassVar var = new RubyClassVar(type, iVisited.getName());
  
! 		RubyElementInfo parentInfo = infoStack.peek();
! 		parentInfo.addChild(var);
! 
  		RubyFieldElementInfo info = new RubyFieldElementInfo();
  		info.setTypeName(estimateValueType(iVisited.getValueNode()));
  
  		newElements.put(var, info);
--- 371,387 ----
  	public void visitClassVarDeclNode(ClassVarDeclNode iVisited) {
  		handleNode(iVisited);
+ 		String name = iVisited.getName();
  		RubyElement type = getCurrentType();
  		RubyClassVar var = new RubyClassVar(type, iVisited.getName());
  
! 		RubyElementInfo parentInfo = infoStack.peek();		
  		RubyFieldElementInfo info = new RubyFieldElementInfo();
  		info.setTypeName(estimateValueType(iVisited.getValueNode()));
+ 		info.setTypeName(estimateValueType(iVisited.getValueNode()));
+ 		ISourcePosition pos = iVisited.getPosition();
+ 		//setTokenRange(pos, info, name);
+ 		setClassVarRange( pos, info, name );
+ 		
+ 		parentInfo.addChild(var);	
  
  		newElements.put(var, info);
***************
*** 453,456 ****
--- 459,463 ----
  		ISourcePosition pos = iVisited.getPosition();
  		setKeywordRange("class", pos, info, name);
+ 		
  		// TODO Set the superclass!
  		info.setIncludedModuleNames(new String[] {"Kernel"});
***************
*** 467,470 ****
--- 474,507 ----
  	}
  
+ 	private void setLocalVarRange( ISourcePosition pos, MemberElementInfo info, String name ){
+ 		int start = pos.getStartOffset()  - name.length();
+ 		setMemberElementPosition( 
+ 			info,
+ 			start,
+ 			pos.getStartOffset() - 1,
+ 			start,
+ 			pos.getEndOffset() );	
+ 	}
+ 	
+ 	private void setInstanceVarRange( ISourcePosition pos, MemberElementInfo info, String name ){
+ 		int start = pos.getStartOffset()  - name.length();
+ 		setMemberElementPosition( 
+ 			info,
+ 			start,
+ 			pos.getStartOffset()- 1,
+ 			start,
+ 			pos.getEndOffset() );	
+ 	}
+ 	
+ 	private void setClassVarRange( ISourcePosition pos, MemberElementInfo info, String name ){
+ 		int start = pos.getStartOffset() - name.length();
+ 		setMemberElementPosition( 
+ 			info,
+ 			start,
+ 			pos.getStartOffset() - 1,
+ 			start,
+ 			pos.getEndOffset() - 1);
+ 	}	
+ 	
  	/**
  	 * @param keyword
***************
*** 474,481 ****
  	 */
  	private void setKeywordRange(String keyword, ISourcePosition pos, MemberElementInfo info, String name) {
! 		info.setNameSourceStart(pos.getStartOffset() + 1);
! 		info.setNameSourceEnd(pos.getStartOffset() + name.length());
! 		info.setSourceRangeStart(pos.getStartOffset() - keyword.length());
! 		info.setSourceRangeEnd(pos.getEndOffset() - 1);
  	}
  
--- 511,534 ----
  	 */
  	private void setKeywordRange(String keyword, ISourcePosition pos, MemberElementInfo info, String name) {
! 		info.setNameSourceStart( pos.getStartOffset() + 1);
! 		info.setNameSourceEnd(pos.getStartOffset() + name.length() );
! 		info.setSourceRangeStart(pos.getStartOffset() + 1 );
! 		info.setSourceRangeEnd( pos.getEndOffset() );	
! 	}
! 	
! 	/**
! 	 * Sets the position on a given MemberElementInfo object.
! 	 * @param info
! 	 * @param nameSourceStart
! 	 * @param nameSourceEnd
! 	 * @param sourceStart
! 	 * @param sourceEnd
! 	 */
! 	private void setMemberElementPosition( MemberElementInfo info, int nameSourceStart, 
! 			int nameSourceEnd, int sourceStart, int sourceEnd ){
! 		info.setNameSourceStart( nameSourceStart );
! 		info.setNameSourceEnd( nameSourceEnd );
! 		info.setSourceRangeStart( sourceStart );
! 		info.setSourceRangeEnd( sourceEnd );		
  	}
  
***************
*** 910,914 ****
  		info.setNameSourceEnd(pos.getStartOffset() - 1);
  		info.setSourceRangeStart(realStart);
! 		info.setSourceRangeEnd(pos.getStartOffset() - 1);
  	}
  
--- 963,967 ----
  		info.setNameSourceEnd(pos.getStartOffset() - 1);
  		info.setSourceRangeStart(realStart);
! 		info.setSourceRangeEnd(pos.getStartOffset() - 10);
  	}
  
***************
*** 950,954 ****
  		// TODO Add more information to the info object!
  		ISourcePosition pos = iVisited.getPosition();
! 		setTokenRange(pos, info, name);
  		info.setTypeName(estimateValueType(iVisited.getValueNode()));
  
--- 1003,1008 ----
  		// TODO Add more information to the info object!
  		ISourcePosition pos = iVisited.getPosition();
! 		//setTokenRange(pos, info, name);
! 		setInstanceVarRange( pos, info, name );
  		info.setTypeName(estimateValueType(iVisited.getValueNode()));
  
***************
*** 1037,1041 ****
--- 1091,1098 ----
  		RubyFieldElementInfo info = new RubyFieldElementInfo();
  		info.setTypeName(estimateValueType(iVisited.getValueNode()));
+ 		
  		// TODO Set the info!
+ 		ISourcePosition pos = iVisited.getPosition();
+ 		setLocalVarRange( pos, info, iVisited.getName() );
  		infoStack.push(info);
  

[Rubyeclipse-commit] org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher TestUnitRunnerConfiguration.java,1.11,1.12

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16447/src/org/rubypeople/rdt/testunit/launcher

Modified Files:
	TestUnitRunnerConfiguration.java 
Log Message:
Corrected launch filename on windows platform for Test::Unit

Index: TestUnitRunnerConfiguration.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher/TestUnitRunnerConfiguration.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TestUnitRunnerConfiguration.java	17 Jul 2005 23:50:46 -0000	1.11
--- TestUnitRunnerConfiguration.java	5 Aug 2005 20:47:49 -0000	1.12
***************
*** 6,10 ****
  import org.eclipse.core.runtime.IPath;
  import org.eclipse.core.runtime.Path;
- import org.eclipse.core.runtime.Platform;
  import org.eclipse.debug.core.ILaunchConfiguration;
  import org.rubypeople.rdt.internal.launching.InterpreterRunnerConfiguration;
--- 6,9 ----
***************
*** 19,31 ****
  
  	public String getAbsoluteFileName() {
! 		String filename = getFileName();
! 		if (Platform.getOS().equals(Platform.OS_WIN32)) {
! 			// just searching for a colon without consideration of the Platform
! 			// could chop off linux filenames which may contain colons
! 			if (filename.indexOf(':') != -1) {
! 				filename = filename.substring(filename.indexOf(':') + 1);
! 			}
! 		}
! 		return filename;
  	}
  	
--- 18,22 ----
  
  	public String getAbsoluteFileName() {
! 		return new File(getFileName()).getAbsolutePath();
  	}
  	

[Rubyeclipse-commit] org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text RubySourceViewerConfiguration.java,1.20,1.21

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19680/src/org/rubypeople/rdt/internal/ui/text

Modified Files:
	RubySourceViewerConfiguration.java 
Log Message:
Fixed space-for-tab substitution to work the way most editors do. 

Index: RubySourceViewerConfiguration.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/RubySourceViewerConfiguration.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** RubySourceViewerConfiguration.java	1 Apr 2005 02:11:38 -0000	1.20
--- RubySourceViewerConfiguration.java	30 Jul 2005 21:34:54 -0000	1.21
***************
*** 159,163 ****
  	        RubySourceViewer viewer = (RubySourceViewer) sourceViewer;
  	        if (viewer.isTabReplacing()) {
! 				return new String[] { viewer.getTabReplaceString(), "\t", "" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
  			}
  	    }
--- 159,163 ----
  	        RubySourceViewer viewer = (RubySourceViewer) sourceViewer;
  	        if (viewer.isTabReplacing()) {
! 				return new String[] { viewer.getIndentString(), "\t", " " }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
  			}
  	    }

[Rubyeclipse-commit] org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor TabExpander.java,NONE,1.1 RubySourceViewer.java,1.2,1.3

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19680/src/org/rubypeople/rdt/internal/ui/rubyeditor

Modified Files:
	RubySourceViewer.java 
Added Files:
	TabExpander.java 
Log Message:
Fixed space-for-tab substitution to work the way most editors do. 

--- NEW FILE: TabExpander.java ---
package org.rubypeople.rdt.internal.ui.rubyeditor;

import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.DocumentCommand;
import org.eclipse.jface.text.IDocument;

public class TabExpander {

	private final int spacesPerTab;
	private String maxTabString;

	public TabExpander(int spacesPerTab) {
		this.spacesPerTab = spacesPerTab;
		StringBuffer buffer = new StringBuffer();
		for (int i=0; i<spacesPerTab; i++) 
			buffer.append(' ');
		
		maxTabString = buffer.toString(); 
	}

	public void expandTab(DocumentCommand command, IDocument document) {
		try {
			int offsetFromFileStart = command.offset;
			int lineNumber = document.getLineOfOffset(offsetFromFileStart);
			int offsetFromLineStart = offsetFromFileStart - document.getLineOffset(lineNumber);
			if (spacesPerTab > 0) {
				int count = spacesPerTab - offsetFromLineStart % spacesPerTab;
				command.text = maxTabString.substring(0, count);
			} else {
				command.text = " ";
			}
		} catch (BadLocationException e) {
			e.printStackTrace();
		}
	}

	public String getFullIndent() {
		return maxTabString;
	}

}

Index: RubySourceViewer.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubySourceViewer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RubySourceViewer.java	2 Mar 2005 00:54:29 -0000	1.2
--- RubySourceViewer.java	30 Jul 2005 21:34:55 -0000	1.3
***************
*** 9,13 ****
--- 9,15 ----
  import java.util.Arrays;
  
+ import org.eclipse.jface.text.BadLocationException;
  import org.eclipse.jface.text.DocumentCommand;
+ import org.eclipse.jface.text.IDocument;
  import org.eclipse.jface.text.source.IOverviewRuler;
  import org.eclipse.jface.text.source.IVerticalRuler;
***************
*** 20,26 ****
  public class RubySourceViewer extends ProjectionViewer {
  
-     private String tabReplaceString;
      private boolean isTabReplacing = false;
      private boolean fIgnoreTextConverters = false;
  
      public RubySourceViewer(Composite composite, IVerticalRuler verticalRuler,
--- 22,28 ----
  public class RubySourceViewer extends ProjectionViewer {
  
      private boolean isTabReplacing = false;
      private boolean fIgnoreTextConverters = false;
+ 	private TabExpander tabExpander;
  
      public RubySourceViewer(Composite composite, IVerticalRuler verticalRuler,
***************
*** 48,52 ****
          super.customizeDocumentCommand(command);
          if (!fIgnoreTextConverters) {
!             convertTabs(command);
          }
          fIgnoreTextConverters = false;
--- 50,54 ----
          super.customizeDocumentCommand(command);
          if (!fIgnoreTextConverters) {
!             convertTabs(command, getDocument());
          }
          fIgnoreTextConverters = false;
***************
*** 59,73 ****
              int length = RubyPlugin.getDefault().getPreferenceStore().getInt(
                      PreferenceConstants.FORMAT_INDENTATION);
!             char[] spaces = new char[length];
!             Arrays.fill(spaces, ' ');
!             tabReplaceString = new String(spaces);
          }
      }
  
!     protected void convertTabs(DocumentCommand command) {
!         if (!isTabReplacing) { return; }
!         if (command.text.equals("\t")) {
!             command.text = this.tabReplaceString;
!         }
      }
      
--- 61,74 ----
              int length = RubyPlugin.getDefault().getPreferenceStore().getInt(
                      PreferenceConstants.FORMAT_INDENTATION);
!             tabExpander = new TabExpander(length);
          }
      }
  
!     protected void convertTabs(DocumentCommand command, IDocument document) {
!     	if (!isTabReplacing)
!     		return;
!     	
!     	if (command.text.equals("\t")) 
!     		tabExpander.expandTab(command, document);
      }
      
***************
*** 75,86 ****
          return isTabReplacing;
      }
!     
!     /**
!      * 
!      * @return Returns the replacement string for tab if isTabReplacing()
!      */
!     public String getTabReplaceString() {
!         return tabReplaceString;
!     }
!     
  }
--- 76,82 ----
          return isTabReplacing;
      }
! 
! 	public String getIndentString() {
! 		return tabExpander.getFullIndent();
! 	}
  }

[Rubyeclipse-commit] org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/rubyeditor TC_TabExpander.java,NONE,1.1

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/rubyeditor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19638/src/org/rubypeople/rdt/internal/ui/rubyeditor

Added Files:
	TC_TabExpander.java 
Log Message:
Fixed space-for-tab substitution to work the way most editors do. 

--- NEW FILE: TC_TabExpander.java ---
package org.rubypeople.rdt.internal.ui.rubyeditor;

import javax.print.SimpleDoc;

import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.DocumentCommand;

import junit.framework.TestCase;

public class TC_TabExpander extends TestCase {

	private static final String TEST_TEXT = "012345678\n123456789\n";

	private static class TestDocumentCommand extends DocumentCommand {

		public TestDocumentCommand(int offset) {
			this.offset = offset;
		}
	}

	public void testSpacesForTab() {
		verifyTabExpansion(4, 0, 4);
		verifyTabExpansion(4, 1, 3);
		verifyTabExpansion(4, 2, 2);
		verifyTabExpansion(4, 3, 1);
		verifyTabExpansion(4, 4, 4);
		verifyTabExpansion(4, 5, 3);
		verifyTabExpansion(5, 4, 1);
	}

	public void testSubsequentLines() {
		verifyTabExpansion(4, 10, 4);
		verifyTabExpansion(4, 12, 2);
		verifyTabExpansion(4, 14, 4);
	}

	public void testSpacesOneSpacePerTab() {
		verifyTabExpansion(1, 0, 1);
		verifyTabExpansion(1, 1, 1);
		verifyTabExpansion(1, 2, 1);
		verifyTabExpansion(1, 3, 1);
		verifyTabExpansion(1, 4, 1);
	}

	public void testSpacesZeroSpacPerTab() {
		verifyTabExpansion(0, 0, 1);
		verifyTabExpansion(0, 1, 1);
		verifyTabExpansion(0, 2, 1);
		verifyTabExpansion(0, 3, 1);
		verifyTabExpansion(0, 4, 1);
	}

	private void verifyTabExpansion(int spacesPerTab, int currentOffset, int expectedCountOfTabs) {
		TabExpander expander = new TabExpander(spacesPerTab);
		TestDocumentCommand command = new TestDocumentCommand(currentOffset);
		command.text = "\t";
		Document document = new Document(TEST_TEXT);
		
		expander.expandTab(command, document);

		String message = "Offset = "+currentOffset + "; tabWidth = "+spacesPerTab;
		assertEquals(message, "     ".substring(0,expectedCountOfTabs), command.text);
		assertEquals("Full indent (" + spacesPerTab + ")", "     ".substring(0,spacesPerTab), expander.getFullIndent());
	}
	
	
}

[Rubyeclipse-commit] org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui TS_UiTests.java,1.3,1.4

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19638/src/org/rubypeople/rdt/internal/ui

Modified Files:
	TS_UiTests.java 
Log Message:
Fixed space-for-tab substitution to work the way most editors do. 

Index: TS_UiTests.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/TS_UiTests.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TS_UiTests.java	28 Mar 2005 23:22:49 -0000	1.3
--- TS_UiTests.java	30 Jul 2005 21:34:40 -0000	1.4
***************
*** 1,4 ****
--- 1,6 ----
  package org.rubypeople.rdt.internal.ui;
  
+ import org.rubypeople.rdt.internal.ui.rubyeditor.TC_TabExpander;
+ 
  import junit.framework.Test;
  import junit.framework.TestSuite;
***************
*** 11,14 ****
--- 13,17 ----
  		suite.addTestSuite(TC_StackTraceLine.class);
  		suite.addTestSuite(TC_ResourceAdapterFactory.class);
+ 		suite.addTestSuite(TC_TabExpander.class);
  		return suite;
  	}

[Rubyeclipse-commit] org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/rubyeditor - New directory

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/rubyeditor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19600/src/org/rubypeople/rdt/internal/ui/rubyeditor

Log Message:
Directory /cvsroot/rubyeclipse/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/rubyeditor added to the repository

[Rubyeclipse-commit] org.rubypeople.rdt Changelog.txt,1.7,1.8

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7893

Modified Files:
	Changelog.txt 
Log Message:
Changed default key bindings for Comment, Uncomment and ToggleComment to be consistent with JDT.  Changed the keybinding
  category to "Ruby Source" so it doesn't clash with JDT.

Index: Changelog.txt
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt/Changelog.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Changelog.txt	28 Jul 2005 11:57:07 -0000	1.7
--- Changelog.txt	30 Jul 2005 11:38:46 -0000	1.8
***************
*** 35,37 ****
  * Committed patch by Khaled Agrama so Eclipse 3.1 would recognize .rb files with Ruby Editor
  * Committed patch for bug 959808. Singleton methods are now recognized correctly in the outlinew view
! * Create commands for launch short cuts so keys could be bound to them.  Configured default key bindings.
\ No newline at end of file
--- 35,39 ----
  * Committed patch by Khaled Agrama so Eclipse 3.1 would recognize .rb files with Ruby Editor
  * Committed patch for bug 959808. Singleton methods are now recognized correctly in the outlinew view
! * Create commands for launch short cuts so keys could be bound to them.  Configured default key bindings.
! * Changed default key bindings for Comment, Uncomment and ToggleComment to be consistent with JDT.  Changed the keybinding
!   category to "Ruby Source" so it doesn't clash with JDT.
\ No newline at end of file

[Rubyeclipse-commit] org.rubypeople.rdt.ui plugin.properties,1.18,1.19 plugin.xml,1.56,1.57

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7876

Modified Files:
	plugin.properties plugin.xml 
Log Message:
Changed default key bindings for Comment, Uncomment and ToggleComment to be consistent with JDT.  Changed the keybinding
  category to "Ruby Source" so it doesn't clash with JDT.

Index: plugin.properties
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/plugin.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** plugin.properties	12 Mar 2005 16:52:12 -0000	1.18
--- plugin.properties	30 Jul 2005 11:38:43 -0000	1.19
***************
*** 42,46 ****
  ToggleCommentAction.label=&Toggle Comment@Ctrl+Shift+C
  
! category.source.name=Source
  category.source.description= Ruby Source Actions
  
--- 42,46 ----
  ToggleCommentAction.label=&Toggle Comment@Ctrl+Shift+C
  
! category.source.name=Ruby Source
  category.source.description= Ruby Source Actions
  

Index: plugin.xml
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/plugin.xml,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** plugin.xml	22 Jul 2005 03:45:50 -0000	1.56
--- plugin.xml	30 Jul 2005 11:38:43 -0000	1.57
***************
*** 200,204 ****
        </command>
        <keyBinding
!             string="Ctrl+Shift+f"
              scope="org.rubypeople.rdt.ui.rubyEditorScope"
              command="org.rubypeople.rdt.ui.edit.text.ruby.format"
--- 200,204 ----
        </command>
        <keyBinding
!             keySequence="M1+M2+F"
              scope="org.rubypeople.rdt.ui.rubyEditorScope"
              command="org.rubypeople.rdt.ui.edit.text.ruby.format"
***************
*** 212,216 ****
        </command>
        <keyBinding
-             string="Ctrl+/"
              scope="org.rubypeople.rdt.ui.rubyEditorScope"
              command="org.rubypeople.rdt.ui.edit.text.ruby.comment"
--- 212,215 ----
***************
*** 224,228 ****
        </command>
        <keyBinding
-             string="Ctrl+\"
              scope="org.rubypeople.rdt.ui.rubyEditorScope"
              command="org.rubypeople.rdt.ui.edit.text.ruby.uncomment"
--- 223,226 ----
***************
*** 236,240 ****
        </command>
        <keyBinding
!             string="Ctrl+Shift+C"
              scope="org.rubypeople.rdt.ui.rubyEditorScope"
              command="org.rubypeople.rdt.ui.edit.text.ruby.toggle.comment"
--- 234,244 ----
        </command>
        <keyBinding
!             keySequence="M1+/"
!             scope="org.rubypeople.rdt.ui.rubyEditorScope"
!             command="org.rubypeople.rdt.ui.edit.text.ruby.toggle.comment"
!             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
!       </keyBinding>
!       <keyBinding
!             keySequence="M1+M2+C"
              scope="org.rubypeople.rdt.ui.rubyEditorScope"
              command="org.rubypeople.rdt.ui.edit.text.ruby.toggle.comment"
***************
*** 248,252 ****
        </command>
        <keyBinding
!             string="Ctrl+Space"
              scope="org.rubypeople.rdt.ui.rubyEditorScope"
              command="org.rubypeople.rdt.ui.edit.text.ruby.content.assist.proposals"
--- 252,256 ----
        </command>
        <keyBinding
!             keySequence="M1+SPACE"
              scope="org.rubypeople.rdt.ui.rubyEditorScope"
              command="org.rubypeople.rdt.ui.edit.text.ruby.content.assist.proposals"

[Rubyeclipse-commit] org.rubypeople.rdt.core/src/org/rubypeople/rdt/core RubyCore.java,1.8,1.9

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29701/src/org/rubypeople/rdt/core

Modified Files:
	RubyCore.java 
Log Message:
Fix launching of debugger by using fully qualified path.

Index: RubyCore.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/RubyCore.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RubyCore.java	30 Mar 2005 01:57:05 -0000	1.8
--- RubyCore.java	29 Jul 2005 23:58:14 -0000	1.9
***************
*** 250,255 ****
  		if (prefixLength == -1) { throw new RuntimeException("Location of launching bundle does not contain @: " + location); }
  		String pluginDir = location.substring(prefixLength + 1);
! 		if (!new File(pluginDir).exists()) { throw new RuntimeException("Expected directory of eclipseDebug.rb does not exist: " + pluginDir); }
! 		return pluginDir;
  	}
  
--- 250,256 ----
  		if (prefixLength == -1) { throw new RuntimeException("Location of launching bundle does not contain @: " + location); }
  		String pluginDir = location.substring(prefixLength + 1);
! 		File pluginDirFile = new File(pluginDir);
! 		if (!pluginDirFile.exists()) { throw new RuntimeException("Expected directory of eclipseDebug.rb does not exist: " + pluginDir); }
! 		return pluginDirFile.getAbsolutePath()+"/";
  	}
  

[Rubyeclipse-commit] org.rubypeople.rdt.debug.ui plugin.xml,1.42,1.43 plugin.properties,1.15,1.16

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31199

Modified Files:
	plugin.xml plugin.properties 
Log Message:
Create commands for launch short cuts so keys could be bound to them.  Configured default key bindings.  Minor changes to labels for shortcuts.

Index: plugin.properties
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/plugin.properties,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** plugin.properties	7 Mar 2005 20:52:43 -0000	1.15
--- plugin.properties	28 Jul 2005 11:57:16 -0000	1.16
***************
*** 19,24 ****
--- 19,26 ----
  ContextualRunRubyApplication.label=Run Ruby Application
  ContextualDebugRubyApplication.label=Debug Ruby Application
+ 
  RubyApplicationShortcut.label=Ruby Application
  
  cheatsheet.webservices.name=RDT Introduction
  cheatsheet.webservices.desc=Ruby Development Tools (RDT) Introduction
+ 

Index: plugin.xml
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/plugin.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** plugin.xml	12 Jul 2005 22:11:59 -0000	1.42
--- plugin.xml	28 Jul 2005 11:57:15 -0000	1.43
***************
*** 68,84 ****
     </extension>
     <extension
-          point="org.eclipse.debug.ui.launchShortcuts">
-       <shortcut
-             label="%LaunchShortcut.Ruby.label"
-             icon="icons/full/ctool16/run_ruby.gif"
-             class="org.rubypeople.rdt.internal.debug.ui.launcher.RubyApplicationShortcut"
-             modes="run, debug"
-             id="org.rubypeople.rdt.debug.ui.applicationshortcut.ruby">
-          <perspective
-                id="org.eclipse.debug.ui.DebugPerspective">
-          </perspective>
-       </shortcut>
-    </extension>
-    <extension
           point="org.eclipse.ui.editorActions">
        <editorContribution
--- 68,71 ----
***************
*** 275,283 ****
              </enablement>
              <contextLabel
!                   label="%ContextualRunRubyApplication.label"
                    mode="run">
              </contextLabel>
              <contextLabel
!                   label="%ContextualDebugRubyApplication.label"
                    mode="debug">
              </contextLabel>
--- 262,270 ----
              </enablement>
              <contextLabel
!                   label="%LaunchShortcut.Ruby.label"
                    mode="run">
              </contextLabel>
              <contextLabel
!                   label="%LaunchShortcut.Ruby.label"
                    mode="debug">
              </contextLabel>
***************
*** 287,291 ****
--- 274,314 ----
           </perspective>
        </shortcut>
+       <shortcut
+             label="%LaunchShortcut.Ruby.label"
+             icon="icons/full/ctool16/run_ruby.gif"
+             class="org.rubypeople.rdt.internal.debug.ui.launcher.RubyApplicationShortcut"
+             modes="run, debug"
+             id="org.rubypeople.rdt.debug.ui.applicationshortcut.ruby">
+          <perspective
+                id="org.eclipse.debug.ui.DebugPerspective">
+          </perspective>
+       </shortcut>
     </extension>
+    <extension
+          point="org.eclipse.ui.commands">
+       <command
+             name="%ContextualRunRubyApplication.label"
+             description="%ContextualRunRubyApplication.label"
+             categoryId="org.eclipse.debug.ui.category.run"
+             id="org.rubypeople.rdt.debug.ui.RubyShortcut.run">
+       </command>
+       <command
+             name="%ContextualDebugRubyApplication.label"
+             description="%ContextualDebugRubyApplication.label"
+             categoryId="org.eclipse.debug.ui.category.run"
+             id="org.rubypeople.rdt.debug.ui.RubyShortcut.debug">
+       </command>
+    </extension>
+    <extension point="org.eclipse.ui.bindings">
+       <key
+             sequence="M3+M2+D R"
+             commandId="org.rubypeople.rdt.debug.ui.RubyShortcut.debug"
+             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+       <key
+             sequence="M3+M2+X R"
+             commandId="org.rubypeople.rdt.debug.ui.RubyShortcut.run"
+             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+    </extension>
+    
     <extension 
     		 point="org.eclipse.ui.cheatsheets.cheatSheetContent">

[Rubyeclipse-commit] org.rubypeople.rdt.testunit plugin.xml,1.12,1.13 plugin.properties,1.3,1.4

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31170

Modified Files:
	plugin.xml plugin.properties 
Log Message:
Create commands for launch short cuts so keys could be bound to them.  Configured default key bindings.  Minor changes to labels for shortcuts.

Index: plugin.properties
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/plugin.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** plugin.properties	11 Mar 2005 03:21:43 -0000	1.3
--- plugin.properties	28 Jul 2005 11:57:11 -0000	1.4
***************
*** 8,10 ****
  TestUnitTabGroupDescription.run=Create a configuration that will launch a Test::Unit test.
  
! testRunTabs.name= Test Run Tabs
\ No newline at end of file
--- 8,13 ----
  TestUnitTabGroupDescription.run=Create a configuration that will launch a Test::Unit test.
  
! testRunTabs.name= Test Run Tabs
! 
! TestUnitShortcut.description.run= Run Test::Unit Test
! TestUnitShortcut.description.debug= Debug Test::Unit Test
\ No newline at end of file

Index: plugin.xml
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/plugin.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** plugin.xml	28 Mar 2005 23:23:25 -0000	1.12
--- plugin.xml	28 Jul 2005 11:57:11 -0000	1.13
***************
*** 141,144 ****
        </launchConfigurationTabGroup>
     </extension>
! 
  </plugin>
--- 141,168 ----
        </launchConfigurationTabGroup>
     </extension>
!    <extension
!          point="org.eclipse.ui.commands">
!       <command
!             name="%TestUnitShortcut.description.run"
!             description="%TestUnitShortcut.description.run"
!             categoryId="org.eclipse.debug.ui.category.run"
!             id="org.rubypeople.rdt.testunit.testunitShortcut.run">
!       </command>
!       <command
!             name="%TestUnitShortcut.description.debug"
!             description="%TestUnitShortcut.description.debug"
!             categoryId="org.eclipse.debug.ui.category.run"
!             id="org.rubypeople.rdt.testunit.testunitShortcut.debug">
!       </command>
!    </extension>
!    <extension point="org.eclipse.ui.bindings">
!       <key
!             sequence="M3+M2+D U"
!             commandId="org.rubypeople.rdt.testunit.testunitShortcut.debug"
!             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
!       <key
!             sequence="M3+M2+X U"
!             commandId="org.rubypeople.rdt.testunit.testunitShortcut.run"
!             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
!    </extension>
  </plugin>

[Rubyeclipse-commit] org.rubypeople.rdt Changelog.txt,1.6,1.7

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31150

Modified Files:
	Changelog.txt 
Log Message:
Create commands for launch short cuts so keys could be bound to them.  Configured default key bindings.  Minor changes to labels for shortcuts.

Index: Changelog.txt
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt/Changelog.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Changelog.txt	22 Jul 2005 03:56:04 -0000	1.6
--- Changelog.txt	28 Jul 2005 11:57:07 -0000	1.7
***************
*** 35,36 ****
--- 35,37 ----
  * Committed patch by Khaled Agrama so Eclipse 3.1 would recognize .rb files with Ruby Editor
  * Committed patch for bug 959808. Singleton methods are now recognized correctly in the outlinew view
+ * Create commands for launch short cuts so keys could be bound to them.  Configured default key bindings.
\ No newline at end of file

[Rubyeclipse-commit] org.rubypeople.rdt Changelog.txt,1.5,1.6

[Zach D. <zd...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31837

Modified Files:
	Changelog.txt 
Log Message:
Updated changelog for recent patch where Eclipse 3.1 now recognizes .rb files as Ruby source files.

Also updated for the bug fix on bug959808 which was completed last week.

Index: Changelog.txt
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt/Changelog.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Changelog.txt	16 Jul 2005 21:19:45 -0000	1.5
--- Changelog.txt	22 Jul 2005 03:56:04 -0000	1.6
***************
*** 33,34 ****
--- 33,36 ----
  * Test::Unit tests can be launched in debug mode
  * Syntax highlighting (and customization) of regular expressions and commands
+ * Committed patch by Khaled Agrama so Eclipse 3.1 would recognize .rb files with Ruby Editor
+ * Committed patch for bug 959808. Singleton methods are now recognized correctly in the outlinew view

[Rubyeclipse-commit] org.rubypeople.rdt.core plugin.properties,1.5,1.6

[Zach D. <zd...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30489

Modified Files:
	plugin.properties 
Log Message:
Fixes issue where .rb files are by default treated as ruby source files.

Index: plugin.properties
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/plugin.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** plugin.properties	11 Mar 2005 03:21:41 -0000	1.5
--- plugin.properties	22 Jul 2005 03:45:15 -0000	1.6
***************
*** 10,12 ****
  rubyProblemName= Ruby Problem
  rubyTaskName= Ruby Task
! transientRubyProblemName=Transient Ruby Problem
\ No newline at end of file
--- 10,13 ----
  rubyProblemName= Ruby Problem
  rubyTaskName= Ruby Task
! transientRubyProblemName=Transient Ruby Problem
! rubySourceName=Ruby Source File

[Rubyeclipse-commit] org.rubypeople.rdt.ui plugin.xml,1.55,1.56

[Zach D. <zd...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30599

Modified Files:
	plugin.xml 
Log Message:
Fixes issue where .rb files are by default treated as ruby source files.

Index: plugin.xml
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/plugin.xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** plugin.xml	12 Mar 2005 16:52:12 -0000	1.55
--- plugin.xml	22 Jul 2005 03:45:50 -0000	1.56
***************
*** 165,168 ****
--- 165,169 ----
              contributorClass="org.rubypeople.rdt.internal.ui.rubyeditor.RubyEditorActionContributor"
              id="org.rubypeople.rdt.ui.EditorRubyFile">
+          <contentTypeBinding contentTypeId="org.rubypeople.rdt.core.rubySource"/>
        </editor>
        <editor

[Rubyeclipse-commit] org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher TestUnitLaunchShortcut.java,1.9,1.10 TestUnitRunnerConfiguration.java,1.10,1.11

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21862/src/org/rubypeople/rdt/testunit/launcher

Modified Files:
	TestUnitLaunchShortcut.java TestUnitRunnerConfiguration.java 
Log Message:
Fixed launch for Test Unit.

Index: TestUnitRunnerConfiguration.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher/TestUnitRunnerConfiguration.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TestUnitRunnerConfiguration.java	28 Mar 2005 23:23:23 -0000	1.10
--- TestUnitRunnerConfiguration.java	17 Jul 2005 23:50:46 -0000	1.11
***************
*** 1,4 ****
--- 1,6 ----
  package org.rubypeople.rdt.testunit.launcher;
  
+ import java.io.File;
+ 
  import org.eclipse.core.runtime.CoreException;
  import org.eclipse.core.runtime.IPath;
***************
*** 27,30 ****
--- 29,36 ----
  		return filename;
  	}
+ 	
+ 	public String getFileName() {
+ 		return getTestRunnerPath();
+ 	}
  
  	/*
***************
*** 82,84 ****
--- 88,105 ----
  		return super.renderLoadPath() + " -I " + absoluteTestFilePath;
  	}
+ 
+ 	public static String getTestRunnerPath() {
+ 		String location = TestunitPlugin.getDefault().getBundle().getLocation();
+ 		int prefixLength = location.indexOf('@');
+ 		if (prefixLength == -1)  
+ 			throw new RuntimeException("Location of launching bundle does not contain @: " + location); 
+ 		
+ 		String pluginDir = location.substring(prefixLength + 1) + "ruby";
+ 		File pluginDirFile = new File(pluginDir);
+ 		
+ 		if (!pluginDirFile.exists()) 
+ 			throw new RuntimeException("Expected directory of RemoteTestRunner.rb does not exist: " + pluginDir); 
+ 	
+ 		return pluginDirFile.getAbsolutePath() + File.separator + TestUnitLaunchShortcut.TEST_RUNNER_FILE;
+ 	}
  }
\ No newline at end of file

Index: TestUnitLaunchShortcut.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher/TestUnitLaunchShortcut.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TestUnitLaunchShortcut.java	28 Mar 2005 23:23:23 -0000	1.9
--- TestUnitLaunchShortcut.java	17 Jul 2005 23:50:46 -0000	1.10
***************
*** 11,15 ****
  package org.rubypeople.rdt.testunit.launcher;
  
- import java.io.File;
  import java.util.ArrayList;
  import java.util.List;
--- 11,14 ----
***************
*** 46,50 ****
  public class TestUnitLaunchShortcut implements ILaunchShortcut {
  
! 	private static final String TEST_RUNNER_FILE = "RemoteTestRunner.rb";
  
  	public void launch(ISelection selection, String mode) {
--- 45,49 ----
  public class TestUnitLaunchShortcut implements ILaunchShortcut {
  
! 	static final String TEST_RUNNER_FILE = "RemoteTestRunner.rb";
  
  	public void launch(ISelection selection, String mode) {
***************
*** 184,194 ****
  			wc.setAttribute(RubyLaunchConfigurationAttribute.PROJECT_NAME, rubyFile.getProject().getName());
  
- 			String location = TestunitPlugin.getDefault().getBundle().getLocation();
- 			int prefixLength = location.indexOf('@');
- 			if (prefixLength == -1) { throw new RuntimeException("Location of launching bundle does not contain @: " + location); }
- 			String pluginDir = location.substring(prefixLength + 1) + "ruby";
- 			if (!new File(pluginDir).exists()) { throw new RuntimeException("Expected directory of RemoteTestRunner.rb does not exist: " + pluginDir); }
  			int port = SocketUtil.findFreePort();
! 			wc.setAttribute(RubyLaunchConfigurationAttribute.FILE_NAME, pluginDir + File.separator + TEST_RUNNER_FILE);
  			wc.setAttribute(RubyLaunchConfigurationAttribute.WORKING_DIRECTORY, TestUnitLaunchShortcut.getDefaultWorkingDirectory(rubyFile.getProject()));
  			wc.setAttribute(RubyLaunchConfigurationAttribute.SELECTED_INTERPRETER, RubyRuntime.getDefault().getSelectedInterpreter().getName());
--- 183,189 ----
  			wc.setAttribute(RubyLaunchConfigurationAttribute.PROJECT_NAME, rubyFile.getProject().getName());
  
  			int port = SocketUtil.findFreePort();
! 			// FIXME Probably shouldn't write this out.  It's now ignored at runtime
! 			wc.setAttribute(RubyLaunchConfigurationAttribute.FILE_NAME, TestUnitRunnerConfiguration.getTestRunnerPath());
  			wc.setAttribute(RubyLaunchConfigurationAttribute.WORKING_DIRECTORY, TestUnitLaunchShortcut.getDefaultWorkingDirectory(rubyFile.getProject()));
  			wc.setAttribute(RubyLaunchConfigurationAttribute.SELECTED_INTERPRETER, RubyRuntime.getDefault().getSelectedInterpreter().getName());
***************
*** 196,199 ****
--- 191,195 ----
  			wc.setAttribute(TestUnitLaunchConfigurationDelegate.TESTNAME_ATTR, testName);
  			wc.setAttribute(TestUnitLaunchConfigurationDelegate.TESTTYPE_ATTR, "");
+ 			// FIXME shouldn't this be determined at RUN time, not LAUNCH creation time?
  			wc.setAttribute(TestUnitLaunchConfigurationDelegate.PORT_ATTR, port);
  			wc.setAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, "org.rubypeople.rdt.debug.ui.rubySourceLocator");

[Rubyeclipse-commit] org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser MarkerUtility.java,1.5,1.6

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17631/src/org/rubypeople/rdt/internal/core/parser

Modified Files:
	MarkerUtility.java 
Log Message:
Oops.  Only did half the fix this morning.

Index: MarkerUtility.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/MarkerUtility.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MarkerUtility.java	16 Jul 2005 13:29:43 -0000	1.5
--- MarkerUtility.java	16 Jul 2005 22:26:30 -0000	1.6
***************
*** 117,121 ****
  			map.put(IMarker.CHAR_START, new Integer(task.getSourceStart()));
  			map.put(IMarker.CHAR_END, new Integer(task.getSourceEnd()));
! 			marker = resource.createMarker(IMarker.TASK);
  			marker.setAttributes(map);
  		}
--- 117,121 ----
  			map.put(IMarker.CHAR_START, new Integer(task.getSourceStart()));
  			map.put(IMarker.CHAR_END, new Integer(task.getSourceEnd()));
! 			marker = resource.createMarker(IRubyModelMarker.TASK_MARKER);
  			marker.setAttributes(map);
  		}

[Rubyeclipse-commit] org.rubypeople.rdt Changelog.txt,1.4,1.5

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6364

Modified Files:
	Changelog.txt 
Log Message:
Added note explain how to get rid of dead task markers.

Index: Changelog.txt
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt/Changelog.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Changelog.txt	2 Apr 2005 20:39:13 -0000	1.4
--- Changelog.txt	16 Jul 2005 21:19:45 -0000	1.5
***************
*** 13,16 ****
--- 13,23 ----
      * Ability to set multiple tags
      * Ability to set low, normal or high priorities for tags
+     * Early versions from Head (no official releases) would install a TODO marker that
+       would not be removed. This bug was fixed, but if you've got "stuck Tasks" that 
+       don't match actual task tags in your source file, there are two ways to remove them.
+       1) open the file in the text editor (right-click on the file in Resource Navigator, and 
+       select Open With - Text Editor).  You can then right click on the task tag in the left margin
+       and select Remove Task
+       2) If this doesn't work, you need to basically delete the file, and create a new one in its place.
  * Added shortcuts for inspection during debug session:
      * Extension to the editor's pop-up menu

[Rubyeclipse-commit] org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser MarkerUtility.java,1.4,1.5

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23619/src/org/rubypeople/rdt/internal/core/parser

Modified Files:
	MarkerUtility.java 
Log Message:
Changed to create RubyTask Marker rather than "generic" Task marker.  Fixes bug where markers were never deleted.

Index: MarkerUtility.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/MarkerUtility.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MarkerUtility.java	5 Mar 2005 16:05:15 -0000	1.4
--- MarkerUtility.java	16 Jul 2005 13:29:43 -0000	1.5
***************
*** 106,110 ****
  		int lineNumber = task.getSourceLineNumber();
  		if (lineNumber <= 0) lineNumber = 1;
! 		IMarker marker = markerExists(resource, task.getMessage(), lineNumber, IMarker.TASK);
  		if (marker == null) {
  			HashMap map = new HashMap();
--- 106,110 ----
  		int lineNumber = task.getSourceLineNumber();
  		if (lineNumber <= 0) lineNumber = 1;
! 		IMarker marker = markerExists(resource, task.getMessage(), lineNumber, IRubyModelMarker.TASK_MARKER);
  		if (marker == null) {
  			HashMap map = new HashMap();

[Rubyeclipse-commit] org.rubypeople.rdt.build/bootstrap run.sh,1.7,1.8

[Markus B. <mba...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.build/bootstrap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6577/bootstrap

Modified Files:
	run.sh 
Log Message:
update for building with 3.1

Index: run.sh
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/bootstrap/run.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** run.sh	27 Feb 2005 19:20:36 -0000	1.7
--- run.sh	13 Jul 2005 22:05:15 -0000	1.8
***************
*** 1,5 ****
  echo using RDT_BUILD_HOME: ${RDT_BUILD_HOME:?must be set}
! eclipseDir=${RDT_BUILD_HOME}/eclipse-3.0.1
! pdeBuildPluginVersion=3.0.1
  buildDirectory=${RDT_BUILD_TARGET_DIR:-${RDT_BUILD_HOME}/tmp/PlugInBuildDir}
  bootstrapDir=${buildDirectory}/org.rubypeople.rdt.build/bootstrap
--- 1,5 ----
  echo using RDT_BUILD_HOME: ${RDT_BUILD_HOME:?must be set}
! eclipseDir=${RDT_BUILD_HOME}/eclipse-3.1
! pdeBuildPluginVersion=3.1.0
  buildDirectory=${RDT_BUILD_TARGET_DIR:-${RDT_BUILD_HOME}/tmp/PlugInBuildDir}
  bootstrapDir=${buildDirectory}/org.rubypeople.rdt.build/bootstrap

[Rubyeclipse-commit] org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/parsing MultiReaderStrategy.java,1.7,1.8

[Markus B. <mba...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/parsing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5637/src/org/rubypeople/rdt/internal/debug/core/parsing

Modified Files:
	MultiReaderStrategy.java 
Log Message:
reverted sourrounding of interrupt with try-catch

Index: MultiReaderStrategy.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/parsing/MultiReaderStrategy.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MultiReaderStrategy.java	13 Jul 2005 14:29:25 -0000	1.7
--- MultiReaderStrategy.java	13 Jul 2005 14:32:05 -0000	1.8
***************
*** 103,113 ****
  
  	protected synchronized void removeReader(XmlStreamReader streamReader) {
! 		
! 		try {
! 			((Thread) threads.get(streamReader)).interrupt();
! 		} catch (RuntimeException e) {
! 			// TODO Auto-generated catch block
! 			e.printStackTrace();
! 		}
  		threads.remove(streamReader);
  		streamReaders.remove(streamReader);
--- 103,107 ----
  
  	protected synchronized void removeReader(XmlStreamReader streamReader) {
! 		((Thread) threads.get(streamReader)).interrupt();
  		threads.remove(streamReader);
  		streamReaders.remove(streamReader);

[Rubyeclipse-commit] org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/tests TC_RubyRuntime.java,1.11,1.12

[Markus B. <mba...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4608/src/org/rubypeople/rdt/internal/launching/tests

Modified Files:
	TC_RubyRuntime.java 
Log Message:
updates for 3.1

Index: TC_RubyRuntime.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/tests/TC_RubyRuntime.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TC_RubyRuntime.java	5 Mar 2005 15:18:57 -0000	1.11
--- TC_RubyRuntime.java	13 Jul 2005 14:30:04 -0000	1.12
***************
*** 20,23 ****
--- 20,24 ----
  import org.eclipse.core.resources.IResourceVisitor;
  import org.eclipse.core.resources.IWorkspace;
+ import org.eclipse.core.resources.ResourceAttributes;
  import org.eclipse.core.runtime.CoreException;
  import org.eclipse.core.runtime.IPath;
***************
*** 321,324 ****
--- 322,345 ----
  		}
  
+ 		public String getCharsetFor(Reader reader) throws CoreException {
+ 			// TODO Auto-generated method stub
+ 			return null;
+ 		}
+ 
+ 		public ResourceAttributes getResourceAttributes() {
+ 			// TODO Auto-generated method stub
+ 			return null;
+ 		}
+ 
+ 		public void revertModificationStamp(long value) throws CoreException {
+ 			// TODO Auto-generated method stub
+ 			
+ 		}
+ 
+ 		public void setResourceAttributes(ResourceAttributes attributes) throws CoreException {
+ 			// TODO Auto-generated method stub
+ 			
+ 		}
+ 
  
  	}