Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2227] trunk/org.rubypeople.rdt.ui
|
From: <caw...@us...> - 2007-03-26 14:09:52
|
Revision: 2227
http://svn.sourceforge.net/rubyeclipse/?rev=2227&view=rev
Author: cawilliams
Date: 2007-03-26 07:09:51 -0700 (Mon, 26 Mar 2007)
Log Message:
-----------
remove some partitioning stuff which no longer is hooked up.
Modified Paths:
--------------
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/template/ruby/RubyFormatter.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/IRubyPartitions.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/comment/CommentFormattingStrategy.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyAutoIndentStrategy.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/text/RubySourceViewerConfiguration.java
trunk/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/text/RubyPartitionScannerTest.java
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/template/ruby/RubyFormatter.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/template/ruby/RubyFormatter.java 2007-03-26 13:53:25 UTC (rev 2226)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/template/ruby/RubyFormatter.java 2007-03-26 14:09:51 UTC (rev 2227)
@@ -129,10 +129,7 @@
return partitionType != null && (
partitionType.equals(IRubyPartitions.RUBY_MULTI_LINE_COMMENT) ||
- partitionType.equals(IRubyPartitions.RUBY_SINGLE_LINE_COMMENT) ||
- partitionType.equals(IRubyPartitions.RUBY_STRING) ||
- partitionType.equals(IRubyPartitions.RUBY_CHARACTER) ||
- partitionType.equals(IRubyPartitions.RUBY_DOC));
+ partitionType.equals(IRubyPartitions.RUBY_SINGLE_LINE_COMMENT)); // FIXME How do we tell if we're in a string now?
} catch (BadLocationException e) {
return false;
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/IRubyPartitions.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/IRubyPartitions.java 2007-03-26 13:53:25 UTC (rev 2226)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/IRubyPartitions.java 2007-03-26 14:09:51 UTC (rev 2227)
@@ -16,11 +16,7 @@
* @since 0.7.0
*/
public final static String RUBY_PARTITIONING= "___ruby_partitioning"; //$NON-NLS-1$
-
- public static final String RUBY_REGEX = "__ruby_regular_expression"; //$NON-NLS-1$
-
- public static final String RUBY_COMMAND = "__ruby_command"; //$NON-NLS-1$
-
+
/**
* The identifier of the single-line end comment partition content type.
*/
@@ -29,21 +25,5 @@
/**
* The identifier multi-line comment partition content type.
*/
- String RUBY_MULTI_LINE_COMMENT= "__ruby_multiline_comment"; //$NON-NLS-1$
-
- /**
- * The identifier of the Rdoc (JLS2: DocumentationComment) partition content type.
- */
- String RUBY_DOC= "__ruby_rdoc"; //$NON-NLS-1$
-
- /**
- * The identifier of the Ruby string partition content type.
- */
- String RUBY_STRING= "__ruby_string"; //$NON-NLS-1$
-
- /**
- * The identifier of the Ruby character partition content type.
- */
- String RUBY_CHARACTER= "__ruby_character"; //$NON-NLS-1$
-
+ String RUBY_MULTI_LINE_COMMENT= "__ruby_multiline_comment"; //$NON-NLS-1$
}
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/comment/CommentFormattingStrategy.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/comment/CommentFormattingStrategy.java 2007-03-26 13:53:25 UTC (rev 2226)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/comment/CommentFormattingStrategy.java 2007-03-26 14:09:51 UTC (rev 2227)
@@ -136,8 +136,6 @@
return CodeFormatter.K_SINGLE_LINE_COMMENT;
if (IRubyPartitions.RUBY_MULTI_LINE_COMMENT.equals(type))
return CodeFormatter.K_MULTI_LINE_COMMENT;
- if (IRubyPartitions.RUBY_DOC.equals(type))
- return CodeFormatter.K_RUBY_DOC;
return CodeFormatter.K_UNKNOWN;
}
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyAutoIndentStrategy.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyAutoIndentStrategy.java 2007-03-26 13:53:25 UTC (rev 2226)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyAutoIndentStrategy.java 2007-03-26 14:09:51 UTC (rev 2227)
@@ -92,8 +92,8 @@
int start= reg.getOffset();
ITypedRegion region= TextUtilities.getPartition(d, fPartitioning, start, true);
- if (IRubyPartitions.RUBY_DOC.equals(region.getType()))
- start= d.getLineInformationOfOffset(region.getOffset()).getOffset();
+// if (IRubyPartitions.RUBY_DOC.equals(region.getType()))
+// start= d.getLineInformationOfOffset(region.getOffset()).getOffset();
// insert closing "end" on new line after an unclosed block
if (closeBlock() && unclosedBlock(d, start, c.offset)) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/text/RubySourceViewerConfiguration.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/text/RubySourceViewerConfiguration.java 2007-03-26 13:53:25 UTC (rev 2226)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/text/RubySourceViewerConfiguration.java 2007-03-26 14:09:51 UTC (rev 2227)
@@ -132,10 +132,8 @@
final MultiPassContentFormatter formatter = new MultiPassContentFormatter(getConfiguredDocumentPartitioning(sourceViewer), IDocument.DEFAULT_CONTENT_TYPE);
formatter.setMasterStrategy(new RubyFormattingStrategy());
- formatter.setSlaveStrategy(new CommentFormattingStrategy(), IRubyPartitions.RUBY_DOC);
formatter.setSlaveStrategy(new CommentFormattingStrategy(), IRubyPartitions.RUBY_SINGLE_LINE_COMMENT);
formatter.setSlaveStrategy(new CommentFormattingStrategy(), IRubyPartitions.RUBY_MULTI_LINE_COMMENT);
-
return formatter;
}
Modified: trunk/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/text/RubyPartitionScannerTest.java
===================================================================
--- trunk/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/text/RubyPartitionScannerTest.java 2007-03-26 13:53:25 UTC (rev 2226)
+++ trunk/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/text/RubyPartitionScannerTest.java 2007-03-26 14:09:51 UTC (rev 2227)
@@ -21,8 +21,9 @@
public void testSingleLineComment() {
setDocument("# comment");
- assertEquals(IRubyPartitions.RUBY_SINGLE_LINE_COMMENT, scanner
- .nextToken().getData());
+// assertEquals(IRubyPartitions.RUBY_SINGLE_LINE_COMMENT, scanner
+// .nextToken().getData());
+ assertNull(scanner.nextToken().getData()); // comments are default partition now
}
public void testMultiLineComment() {
@@ -43,139 +44,4 @@
assertNull(scanner.nextToken().getData());
}
- public void testDoubleQuotedString() {
- setDocument("\"double quoted string\"");
- assertEquals(IRubyPartitions.RUBY_STRING, scanner.nextToken().getData());
- }
-
- public void testSingleQuotedString() {
- setDocument("'single quoted string'");
- assertEquals(IRubyPartitions.RUBY_STRING, scanner.nextToken().getData());
- assertTrue(scanner.nextToken().isEOF());
- }
-
- public void testCommand() {
- setDocument("`command`");
- assertEquals(IRubyPartitions.RUBY_COMMAND, scanner.nextToken()
- .getData());
- assertTrue(scanner.nextToken().isEOF());
- }
-
- public void testRegularExpression() {
- setDocument("/regex/");
- assertEquals(IRubyPartitions.RUBY_REGEX, scanner.nextToken().getData());
- assertTrue(scanner.nextToken().isEOF());
- }
-
- public void testRegularExpressionWithPercentSyntax() {
- setDocument("%r(regex)");
- assertEquals(IRubyPartitions.RUBY_REGEX, scanner.nextToken().getData());
- assertTrue(scanner.nextToken().isEOF());
-
- setDocument("%r!regex!");
- assertEquals(IRubyPartitions.RUBY_REGEX, scanner.nextToken().getData());
- assertTrue(scanner.nextToken().isEOF());
-
- setDocument("%r{regex}");
- assertEquals(IRubyPartitions.RUBY_REGEX, scanner.nextToken().getData());
- assertTrue(scanner.nextToken().isEOF());
- }
-
- public void testCommandWithPercentSyntax() {
- setDocument("%x(command)");
- assertEquals(IRubyPartitions.RUBY_COMMAND, scanner.nextToken().getData());
- assertTrue(scanner.nextToken().isEOF());
-
- setDocument("%x!command!");
- assertEquals(IRubyPartitions.RUBY_COMMAND, scanner.nextToken().getData());
- assertTrue(scanner.nextToken().isEOF());
-
- setDocument("%x{command}");
- assertEquals(IRubyPartitions.RUBY_COMMAND, scanner.nextToken().getData());
- assertTrue(scanner.nextToken().isEOF());
- }
-
- public void testStringWithPercentSyntax() {
- setDocument("%q(command) # Comment");
- assertEquals(IRubyPartitions.RUBY_STRING, scanner.nextToken().getData());
- assertCommentFollows();
-
- setDocument("%q!command! # Comment");
- assertEquals(IRubyPartitions.RUBY_STRING, scanner.nextToken().getData());
- assertCommentFollows();
-
- setDocument("%q{command} # Comment");
- assertEquals(IRubyPartitions.RUBY_STRING, scanner.nextToken().getData());
- assertCommentFollows();
-
- setDocument("%Q(command) # Comment");
- assertEquals(IRubyPartitions.RUBY_STRING, scanner.nextToken().getData());
- assertCommentFollows();
-
- setDocument("%Q!command! # Comment");
- assertEquals(IRubyPartitions.RUBY_STRING, scanner.nextToken().getData());
- assertCommentFollows();
-
- setDocument("%Q[command] # Comment");
- assertEquals(IRubyPartitions.RUBY_STRING, scanner.nextToken().getData());
- assertCommentFollows();
-
- setDocument("%/command/ # Comment");
- assertEquals(IRubyPartitions.RUBY_STRING, scanner.nextToken().getData());
- assertCommentFollows();
-
- setDocument("%!command! # Comment");
- assertEquals(IRubyPartitions.RUBY_STRING, scanner.nextToken().getData());
- assertCommentFollows();
-
- setDocument("%[command] # Comment");
- assertEquals(IRubyPartitions.RUBY_STRING, scanner.nextToken().getData());
- assertCommentFollows();
- }
-
- private void assertCommentFollows() {
- assertNull(scanner.nextToken().getData());
- assertEquals(IRubyPartitions.RUBY_SINGLE_LINE_COMMENT, scanner
- .nextToken().getData());
- assertTrue(scanner.nextToken().isEOF());
- }
-
- public void testRegularExpressionClosesProperly() {
- setDocument("/regex/ # Comment");
- assertEquals(IRubyPartitions.RUBY_REGEX, scanner.nextToken().getData());
- assertCommentFollows();
- }
-
- public void testRegularExpressionWithOptions() {
- setDocument("/regex/i");
- assertEquals(IRubyPartitions.RUBY_REGEX, scanner.nextToken().getData());
- assertTrue("Failed to gobble up option/flag as part of regular expression",scanner.nextToken().isEOF());
-
- setDocument("/regex/i # Comment");
- assertEquals(IRubyPartitions.RUBY_REGEX, scanner.nextToken().getData());
- assertNull(scanner.nextToken().getData());
- assertEquals(IRubyPartitions.RUBY_SINGLE_LINE_COMMENT, scanner
- .nextToken().getData());
- }
-
- public void testStringWithEscapedEndChar() {
- setDocument("%q(ain\\)# blah)");
- assertEquals(IRubyPartitions.RUBY_STRING, scanner.nextToken().getData());
- assertTrue("failed to skip escaped end character", scanner.nextToken().isEOF());
-
- setDocument("%(ain\\)# blah)");
- assertEquals(IRubyPartitions.RUBY_STRING, scanner.nextToken().getData());
- assertTrue("failed to skip escaped end character", scanner.nextToken().isEOF());
-
- setDocument("%Q(ain\\)# blah)");
- assertEquals(IRubyPartitions.RUBY_STRING, scanner.nextToken().getData());
- assertTrue("failed to skip escaped end character", scanner.nextToken().isEOF());
- }
-
- public void testExpressionSubstitution() {
- setDocument("%{There are #{count} monkeys}");
- assertEquals(IRubyPartitions.RUBY_STRING, scanner.nextToken().getData());
- assertTrue("failed to gobble up expression substiution", scanner.nextToken().isEOF());
- }
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
