Try to get the

cdietrich · cdietrich · commit 213c6c539054 · 2013-11-08T00:20:26.000+01:00
Nodeclipse#19 fixed
diff --git a/csep.tests/xtend-gen/csep/tests/basic/.gitignore b/csep.tests/xtend-gen/csep/tests/basic/.gitignore
@@ -0,0 +1,20 @@
+/.ArrayTest.java._trace
+/.AssignTest.java._trace
+/.ClassTest.java._trace
+/.ControlFlowTest.java._trace
+/.DictionaryTest.java._trace
+/.FunctionCallTest.java._trace
+/.LambdaTest.java._trace
+/.LiteralTest.java._trace
+/.OperatorsTest.java._trace
+/.ScopeTest.java._trace
+/ArrayTest.java
+/AssignTest.java
+/ClassTest.java
+/ControlFlowTest.java
+/DictionaryTest.java
+/FunctionCallTest.java
+/LambdaTest.java
+/LiteralTest.java
+/OperatorsTest.java
+/ScopeTest.java
diff --git a/csep.tests/xtend-gen/csep/tests/coffee/.gitignore b/csep.tests/xtend-gen/csep/tests/coffee/.gitignore
@@ -0,0 +1,4 @@
+/.NodesCoffeeTest.java._trace
+/.Showcase.java._trace
+/NodesCoffeeTest.java
+/Showcase.java
diff --git a/csep.tests/xtend-gen/csep/tests/coffee/Showcase.java b/csep.tests/xtend-gen/csep/tests/coffee/Showcase.java
@@ -37,7 +37,7 @@ public void test_interpolation() {
     _builder.append("quote  = \"A picture is a fact. -- #{ author }\"");
     _builder.newLine();
     _builder.newLine();
-    _builder.append("sentence = \"#{ 22 / 7 } is a decent approximation of \uFFFD\uFFFD\"");
+    _builder.append("sentence = \"#{ 22 / 7 } is a decent approximation of \ufffd\ufffd\"");
     _builder.newLine();
     this.ok(_builder);
   }
diff --git a/csep.tests/xtend-gen/csep/tests/lexer/.PositionTest.java._trace b/csep.tests/xtend-gen/csep/tests/lexer/.PositionTest.java._trace
diff --git a/csep.tests/xtend-gen/csep/tests/lexer/.gitignore b/csep.tests/xtend-gen/csep/tests/lexer/.gitignore
@@ -0,0 +1,4 @@
+/.PositionTest.java._trace
+/.TokenTest.java._trace
+/PositionTest.java
+/TokenTest.java
diff --git a/csep.tests/xtend-gen/csep/tests/other/.gitignore b/csep.tests/xtend-gen/csep/tests/other/.gitignore
@@ -0,0 +1,6 @@
+/.CakefileTest.java._trace
+/.ErrorLocationTest.java._trace
+/.MissingFeaturesTest.java._trace
+/CakefileTest.java
+/ErrorLocationTest.java
+/MissingFeaturesTest.java
diff --git a/csep.tests/xtend-gen/csep/tests/parser/.gitignore b/csep.tests/xtend-gen/csep/tests/parser/.gitignore
@@ -0,0 +1,2 @@
+/.HelperTest.java._trace
+/HelperTest.java
diff --git a/csep.ui/src-gen/csep/ui/contentassist/AbstractCoffeeScriptProposalProvider.java b/csep.ui/src-gen/csep/ui/contentassist/AbstractCoffeeScriptProposalProvider.java
@@ -9,7 +9,7 @@
 import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
 
 /**
- * Represents a generated, default implementation of interface {@link IProposalProvider}.
+ * Represents a generated, default implementation of superclass {@link org.eclipse.xtext.ui.editor.contentassist.AbstractJavaBasedContentProposalProvider}.
  * Methods are dynamically dispatched on the first parameter, i.e., you can override them 
  * with a more concrete subtype. 
  */
diff --git a/csep.ui/src-gen/csep/ui/contentassist/antlr/PartialCoffeeScriptContentAssistParser.java b/csep.ui/src-gen/csep/ui/contentassist/antlr/PartialCoffeeScriptContentAssistParser.java
@@ -15,6 +15,7 @@
 /**
  * @author Sebastian Zarnekow - Initial contribution and API
  */
+@SuppressWarnings("restriction")
 public class PartialCoffeeScriptContentAssistParser extends CoffeeScriptParser implements IPartialContentAssistParser {
 
 	private AbstractRule rule;
diff --git a/csep/src-gen/csep/CoffeeScript.genmodel b/csep/src-gen/csep/CoffeeScript.genmodel
@@ -4,7 +4,7 @@
     modelPluginID="csep" forceOverwrite="true" modelName="CoffeeScript" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="5.0"
     copyrightFields="false" editPluginID="csep.edit" editorPluginID="csep.editor"
-    runtimeVersion="2.8">
+    runtimeVersion="2.9">
   <genPackages prefix="CoffeeScript" basePackage="csep" disposableProviderFactory="true"
       ecorePackage="CoffeeScript.ecore#/">
     <genClasses ecoreClass="CoffeeScript.ecore#//Root"/>
diff --git a/csep/src-gen/csep/CoffeeScript.xmi b/csep/src-gen/csep/CoffeeScript.xmi
diff --git a/csep/src-gen/csep/CoffeeScript.xtextbin b/csep/src-gen/csep/CoffeeScript.xtextbin
diff --git a/csep/src-gen/csep/CoffeeScriptStandaloneSetupGenerated.java b/csep/src-gen/csep/CoffeeScriptStandaloneSetupGenerated.java
@@ -24,6 +24,9 @@ public Injector createInjectorAndDoEMFRegistration() {
 		if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("xmi"))
 			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(
 				"xmi", new org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl());
+		if (!Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("xtextbin"))
+			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(
+				"xtextbin", new org.eclipse.xtext.resource.impl.BinaryGrammarResourceFactoryImpl());
 		if (!EPackage.Registry.INSTANCE.containsKey(org.eclipse.xtext.XtextPackage.eNS_URI))
 			EPackage.Registry.INSTANCE.put(org.eclipse.xtext.XtextPackage.eNS_URI, org.eclipse.xtext.XtextPackage.eINSTANCE);
 
diff --git a/csep/src-gen/csep/coffeeScript/impl/CoffeeScriptFactoryImpl.java b/csep/src-gen/csep/coffeeScript/impl/CoffeeScriptFactoryImpl.java
@@ -30,7 +30,7 @@ public static CoffeeScriptFactory init()
   {
     try
     {
-      CoffeeScriptFactory theCoffeeScriptFactory = (CoffeeScriptFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.coffeescript.org/eclipse"); 
+      CoffeeScriptFactory theCoffeeScriptFactory = (CoffeeScriptFactory)EPackage.Registry.INSTANCE.getEFactory(CoffeeScriptPackage.eNS_URI);
       if (theCoffeeScriptFactory != null)
       {
         return theCoffeeScriptFactory;
diff --git a/csep/src/com/aptana/editor/coffee/parsing/lexer/CoffeeScanner.java b/csep/src/com/aptana/editor/coffee/parsing/lexer/CoffeeScanner.java
@@ -359,8 +359,7 @@ private List<CoffeeSymbol> tokenize(String code, Map<String, Object> opts)
 			code = "\n" + code;
 			this.fOffsetCorrection -= 1;
 		}
-		code = code.replaceAll("\r", "").replaceFirst(
-				TRAILING_SPACES.pattern(), "");
+		code = code.replaceAll("\r", "");
 		this.fCode = code;
 		this.fLine = 0;
 		if (opts.containsKey("fLine")) {
@@ -891,7 +890,7 @@ private int lineToken() {
 			if (noNewlines) {
 				this.suppressNewlines();
 			} else {
-				this.newlineToken();
+				this.newlineToken(indent.length());
 			}
 			return indent.length();
 		}
@@ -969,9 +968,9 @@ private int whitespaceToken() {
 		return 0;
 	}
 
-	private void newlineToken() {
+	private void newlineToken(int i) {
 		if (this.tag() != Terminals.TERMINATOR) {
-			this.token(Terminals.TERMINATOR, "\n", 1);
+			this.token(Terminals.TERMINATOR, "\n", i);
 		}
 		// return this;
 	}
diff --git a/csep/src/csep/Main.java b/csep/src/csep/Main.java
@@ -0,0 +1,30 @@
+package csep;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.xtext.resource.XtextResource;
+
+import com.google.inject.Injector;
+
+public class Main {
+	
+	public static void main(String[] args) throws IOException {
+		FileInputStream in = new FileInputStream("x.coffee");
+		int c = 0;
+		int n = 0;
+		while((n=in.read())>0) c++;
+		in.close();
+		System.out.println(c);
+		
+		
+		Injector i = new CoffeeScriptStandaloneSetup().createInjectorAndDoEMFRegistration();
+		ResourceSet rs = i.getInstance(ResourceSet.class);
+		XtextResource r = (XtextResource)rs.getResource(URI.createURI("x.coffee"), true);
+		r.load(null);
+		System.out.println(r.getParseResult().getRootNode().getTotalLength());
+	}
+
+}
diff --git a/csep/x.coffee b/csep/x.coffee
@@ -0,0 +1,38 @@
+
+
+
+#xxxxx
+
+a = 1+1
+
+
+
+
+
+
+1+1
+
+1111+1111+111+111
+xx=1+1+1
+1+1
+
+
+sssss=1+1
+
+
+
+
+
+
+
+bla = 1+1
+
+
+
+
+
+
+
+
+
+
diff --git a/csep/xtend-gen/csep/generator/.gitignore b/csep/xtend-gen/csep/generator/.gitignore
@@ -0,0 +1,2 @@
+/.CoffeeScriptGenerator.java._trace
+/CoffeeScriptGenerator.java

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public void test_interpolation() {`
`37`	`37`	`_builder.append("quote = \"A picture is a fact. -- #{ author }\"");`
`38`	`38`	`_builder.newLine();`
`39`	`39`	`_builder.newLine();`
`40`		`- _builder.append("sentence = \"#{ 22 / 7 } is a decent approximation of \uFFFD\uFFFD\"");`
	`40`	`+ _builder.append("sentence = \"#{ 22 / 7 } is a decent approximation of \ufffd\ufffd\"");`
`41`	`41`	`_builder.newLine();`
`42`	`42`	`this.ok(_builder);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+/.HelperTest.java._trace`
	`2`	`+/HelperTest.java`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public static CoffeeScriptFactory init()`
`30`	`30`	`{`
`31`	`31`	`try`
`32`	`32`	`{`
`33`		`- CoffeeScriptFactory theCoffeeScriptFactory = (CoffeeScriptFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.coffeescript.org/eclipse");`
	`33`	`+ CoffeeScriptFactory theCoffeeScriptFactory = (CoffeeScriptFactory)EPackage.Registry.INSTANCE.getEFactory(CoffeeScriptPackage.eNS_URI);`
`34`	`34`	`if (theCoffeeScriptFactory != null)`
`35`	`35`	`{`
`36`	`36`	`return theCoffeeScriptFactory;`
Original file line number	Diff line number	Diff line change
`@@ -359,8 +359,7 @@ private List<CoffeeSymbol> tokenize(String code, Map<String, Object> opts)`
`359`	`359`	`code = "\n" + code;`
`360`	`360`	`this.fOffsetCorrection -= 1;`
`361`	`361`	`}`
`362`		`- code = code.replaceAll("\r", "").replaceFirst(`
`363`		`- TRAILING_SPACES.pattern(), "");`
	`362`	`+ code = code.replaceAll("\r", "");`
`364`	`363`	`this.fCode = code;`
`365`	`364`	`this.fLine = 0;`
`366`	`365`	`if (opts.containsKey("fLine")) {`
`@@ -891,7 +890,7 @@ private int lineToken() {`
`891`	`890`	`if (noNewlines) {`
`892`	`891`	`this.suppressNewlines();`
`893`	`892`	`} else {`
`894`		`- this.newlineToken();`
	`893`	`+ this.newlineToken(indent.length());`
`895`	`894`	`}`
`896`	`895`	`return indent.length();`
`897`	`896`	`}`
`@@ -969,9 +968,9 @@ private int whitespaceToken() {`
`969`	`968`	`return 0;`
`970`	`969`	`}`
`971`	`970`
`972`		`- private void newlineToken() {`
	`971`	`+ private void newlineToken(int i) {`
`973`	`972`	`if (this.tag() != Terminals.TERMINATOR) {`
`974`		`- this.token(Terminals.TERMINATOR, "\n", 1);`
	`973`	`+ this.token(Terminals.TERMINATOR, "\n", i);`
`975`	`974`	`}`
`976`	`975`	`// return this;`
`977`	`976`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+/.CoffeeScriptGenerator.java._trace`
	`2`	`+/CoffeeScriptGenerator.java`