Lexer parametized to use editor preferences tab width

darcs-hash:20060119165258-49d33-7f9aa8ba3a41a421da034b60d5b480a276c34157.gz
ttencate · Jan 19, 2006 · 9b6f70c · 9b6f70c
1 parent fcb11b9
commit 9b6f70c
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 62 deletions.
diff --git a/de.leiffrenzel.fp.haskell.ui/.classpath b/de.leiffrenzel.fp.haskell.ui/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/de.leiffrenzel.fp.haskell.ui/.project b/de.leiffrenzel.fp.haskell.ui/.project
@@ -1,42 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>de.leiffrenzel.fp.haskell.ui</name>
-	<comment></comment>
-	<projects>
-		<project>de.leiffrenzel.fp.common.core</project>
-		<project>de.leiffrenzel.fp.common.ui</project>
-		<project>de.leiffrenzel.fp.haskell.core</project>
-		<project>org.eclipse.jface.text</project>
-		<project>org.eclipse.osgi</project>
-		<project>org.eclipse.osgi.services</project>
-		<project>org.eclipse.osgi.util</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.ui.editors</project>
-		<project>org.eclipse.ui.ide</project>
-		<project>org.eclipse.ui.views</project>
-		<project>org.eclipse.ui.workbench.texteditor</project>
-		<project>org.eclipse.update.configurator</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>de.leiffrenzel.fp.haskell.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+	</natures>
+</projectDescription>
diff --git a/de.leiffrenzel.fp.haskell.ui/META-INF/MANIFEST.MF b/de.leiffrenzel.fp.haskell.ui/META-INF/MANIFEST.MF
@@ -20,7 +20,9 @@ Require-Bundle: de.leiffrenzel.fp.haskell.core,
  net.sf.eclipsefp.common.core,
  net.sf.eclipsefp.common.ui
 Eclipse-AutoStart: true
-Provide-Package: de.leiffrenzel.fp.haskell.ui.dialog,
+Provide-Package: de.leiffrenzel.fp.haskell.ui;x-friends:="net.sf.eclipsefp.haskell.ui.test",
+ de.leiffrenzel.fp.haskell.ui.dialog,
  de.leiffrenzel.fp.haskell.ui.launch,
  de.leiffrenzel.fp.haskell.ui.util,
+ de.leiffrenzel.fp.haskell.ui.util.preferences,
  de.leiffrenzel.fp.haskell.ui.util.text
diff --git a/...e/jparser/IHaskellPreferenceProvider.java → ...eferences/IHaskellPreferenceProvider.java b/...e/jparser/IHaskellPreferenceProvider.java → ...eferences/IHaskellPreferenceProvider.java
@@ -1,4 +1,4 @@
-package net.sf.eclipsefp.haskell.core.jparser;
+package de.leiffrenzel.fp.haskell.ui.util.preferences;
 
 public interface IHaskellPreferenceProvider {
 

diff --git a/net.sf.eclipsefp.haskell.core.jparser.test/META-INF/MANIFEST.MF b/net.sf.eclipsefp.haskell.core.jparser.test/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Require-Bundle: org.junit,
  org.eclipse.core.runtime,
  net.sf.eclipsefp.antlr,
  de.leiffrenzel.fp.haskell.core,
- net.sf.eclipsefp.haskell.core.jparser
+ net.sf.eclipsefp.haskell.core.jparser,
+ de.leiffrenzel.fp.haskell.ui
 Bundle-Vendor: eclipsefp.sourceforge.net
 Export-Package: net.sf.eclipsefp.haskell.core.jparser.test
diff --git a/...er.test/src/net/sf/eclipsefp/haskell/core/jparser/test/HaskellPreferenceProviderStub.java b/...er.test/src/net/sf/eclipsefp/haskell/core/jparser/test/HaskellPreferenceProviderStub.java
@@ -1,6 +1,6 @@
 package net.sf.eclipsefp.haskell.core.jparser.test;
 
-import net.sf.eclipsefp.haskell.core.jparser.IHaskellPreferenceProvider;
+import de.leiffrenzel.fp.haskell.ui.util.preferences.IHaskellPreferenceProvider;
 
 public class HaskellPreferenceProviderStub
 	implements IHaskellPreferenceProvider {

diff --git a/...p.haskell.core.jparser.test/src/net/sf/eclipsefp/haskell/core/jparser/test/LexerTest.java b/...p.haskell.core.jparser.test/src/net/sf/eclipsefp/haskell/core/jparser/test/LexerTest.java
@@ -2,6 +2,8 @@
 
 import java.io.StringReader;
 
+import de.leiffrenzel.fp.haskell.ui.util.preferences.IHaskellPreferenceProvider;
+
 import antlr.RecognitionException;
 import antlr.Token;
 import antlr.TokenStreamException;
@@ -206,10 +208,10 @@ public void testMultilineString() throws TokenStreamException {
 	}
 
 	private TestTokenStream createLexer(String input) {
-		return new TestTokenStream(new HaskellLexer(new StringReader(input)));
+		return createLexer(input, new HaskellPreferenceProviderStub());
 	}
 
-	private TestTokenStream createLexer(String input, HaskellPreferenceProviderStub prefs) {
+	private TestTokenStream createLexer(String input, IHaskellPreferenceProvider prefs) {
 		return new TestTokenStream(
 				new HaskellLexer(new StringReader(input), prefs));
 	}

diff --git a/net.sf.eclipsefp.haskell.core.jparser/META-INF/MANIFEST.MF b/net.sf.eclipsefp.haskell.core.jparser/META-INF/MANIFEST.MF
@@ -4,10 +4,11 @@ Bundle-Name: EclipseFP Haskell JParser
 Bundle-SymbolicName: net.sf.eclipsefp.haskell.core.jparser; singleton:=true
 Bundle-Version: 0.9.1
 Bundle-Localization: plugin
-Require-Bundle: de.leiffrenzel.fp.haskell.core,
+Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.runtime,
- org.eclipse.core.resources,
- net.sf.eclipsefp.antlr
+ net.sf.eclipsefp.antlr,
+ de.leiffrenzel.fp.haskell.core,
+ de.leiffrenzel.fp.haskell.ui
 Bundle-Vendor: eclipsefp.sourceforge.net
 Bundle-Activator: net.sf.eclipsefp.haskell.core.jparser.JParserPlugin
 Export-Package: net.sf.eclipsefp.haskell.core.jparser,

diff --git a/net.sf.eclipsefp.haskell.core.jparser/antlr-src/haskell-lexer.g b/net.sf.eclipsefp.haskell.core.jparser/antlr-src/haskell-lexer.g
@@ -11,6 +11,9 @@
  */
 header {
 package net.sf.eclipsefp.haskell.core.jparser;
+
+import de.leiffrenzel.fp.haskell.ui.util.preferences.IHaskellPreferenceProvider;
+
 }
 
 class HaskellLexer extends Lexer;
@@ -51,6 +54,7 @@ tokens {
 {
 	public HaskellLexer(Reader reader, IHaskellPreferenceProvider prefs) {
 		this(reader);
+		this.setTabSize(prefs.getTabSize());
 	}
 
 	/* workaround for starting token coordinates from 0

diff --git a/...sefp.haskell.core.jparser/src/net/sf/eclipsefp/haskell/core/jparser/HaskellFormatter.java b/...sefp.haskell.core.jparser/src/net/sf/eclipsefp/haskell/core/jparser/HaskellFormatter.java
@@ -16,10 +16,6 @@ public HaskellFormatter(TokenStream in) {
 					new QualifiedIdentifierFilter(in))));
 	}
 
-	public HaskellFormatter(TokenStream in, IHaskellPreferenceProvider prefs) {
-		this(in);
-	}
-
 	protected void insertTokensAsNeeded() throws TokenStreamException {
 		if (hasInsertedTokens())
 			return;