Integrates textmate.java. See

angelozerr#114

Author: angelozerr

eclipse/jsdt/ts.eclipse.ide.jsdt.ui/META-INF/MANIFEST.MF

@@ -33,7 +33,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.filesystem,
  org.eclipse.ui.forms,
  org.eclipse.ltk.core.refactoring,
- org.eclipse.ltk.ui.refactoring
+ org.eclipse.ltk.ui.refactoring,
+ org.eclipse.textmate4e.ui
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: ts.eclipse.ide.jsdt.internal.ui.JSDTTypeScriptUIPlugin
 Import-Package: com.eclipsesource.json;version="[0.9.4,0.9.5)"

eclipse/jsdt/ts.eclipse.ide.jsdt.ui/build.properties

@@ -6,4 +6,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                icons/,\
                css/,\
-               templates/
+               templates/,\
+               syntaxes/

eclipse/jsdt/ts.eclipse.ide.jsdt.ui/plugin.xml

@@ -677,4 +677,27 @@
       </include>            
     </extension>
 
+   <extension
+         point="org.eclipse.textmate4e.core.grammars">
+      <grammar
+      		scopeName="source.ts"
+            path="./syntaxes/TypeScript.tmLanguage.json" >
+      </grammar>
+      <grammar
+      		scopeName="source.tsx"
+            path="./syntaxes/TypeScriptReact.tmLanguage.json" >
+      </grammar>
+      <scopeNameContentTypeBinding
+            contentTypeId="ts.eclipse.ide.core.tsSource"
+            scopeName="source.ts">
+      </scopeNameContentTypeBinding>
+      <scopeNameContentTypeBinding
+            contentTypeId="ts.eclipse.ide.core.tsxSource"
+            scopeName="source.tsx">
+      </scopeNameContentTypeBinding>
+      <scopeNameContentTypeBinding
+            contentTypeId="ts.eclipse.ide.core.jsxSource"
+            scopeName="source.tsx">
+      </scopeNameContentTypeBinding>
+   </extension>   
 </plugin>        

eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/editor/JavaScriptLightWeightEditor.java

@@ -603,4 +603,9 @@ protected void setPreferenceStore(IPreferenceStore store) {
 		if (getSourceViewer() instanceof JavaSourceViewer)
 			((JavaSourceViewer)getSourceViewer()).setPreferenceStore(store);
 	}
+	
+	@Override
+	protected boolean affectsTextPresentation(PropertyChangeEvent event) {
+		return ((JavaScriptSourceViewerConfiguration)getSourceViewerConfiguration()).affectsTextPresentation(event) || super.affectsTextPresentation(event);
+	}
 }

eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/editor/TypeScriptSourceViewerConfiguration.java

@@ -35,6 +35,7 @@
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.textmate4e.ui.text.TMPresentationReconciler;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.wst.jsdt.internal.ui.JavaScriptPlugin;
 import org.eclipse.wst.jsdt.internal.ui.text.AbstractJavaScanner;
@@ -57,6 +58,7 @@
 import ts.eclipse.ide.ui.implementation.TypeScriptImplementationDialog;
 import ts.eclipse.ide.ui.outline.TypeScriptElementProvider;
 import ts.eclipse.ide.ui.outline.TypeScriptQuickOutlineDialog;
+import ts.eclipse.ide.ui.preferences.TypeScriptUIPreferenceConstants;
 import ts.eclipse.ide.ui.utils.EditorUtils;
 import ts.resources.ITypeScriptFile;
 
@@ -78,11 +80,14 @@ public class TypeScriptSourceViewerConfiguration extends JavaScriptSourceViewerC
 	 */
 	private AbstractJavaScanner jsxScanner;
 
+	private IPreferenceStore preferenceStore;
+
 	public TypeScriptSourceViewerConfiguration(IColorManager colorManager, IPreferenceStore preferenceStore,
 			ITextEditor editor, String partitioning) {
 		super(colorManager, preferenceStore, editor, partitioning);
 		fCodeScanner = new TypeScriptCodeScanner(colorManager, preferenceStore);
 		jsxScanner = new JSXScanner(colorManager, preferenceStore);
+		this.preferenceStore = preferenceStore;
 
 	}
 
@@ -335,14 +340,17 @@ else if (IJavaScriptPartitions.JAVA_CHARACTER.equals(contentType)
 
 	@Override
 	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
+		if (preferenceStore.getBoolean(TypeScriptUIPreferenceConstants.USE_TEXMATE_FOR_SYNTAX_COLORING)) {
+			// Advanced Syntax coloration with TextMate
+			return new TMPresentationReconciler();
+		}
+		// Use classic Eclipse ITokenScaner.
 		PresentationReconciler reconciler = (PresentationReconciler) super.getPresentationReconciler(sourceViewer);
-
 		DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getJSXScanner());
 		reconciler.setDamager(dr, IJSXPartitions.JSX);
 		reconciler.setRepairer(dr, IJSXPartitions.JSX);
 
 		return reconciler;
-
 	}
 
 	/**
@@ -366,7 +374,8 @@ protected RuleBasedScanner getJSXScanner() {
 
 	public boolean affectsTextPresentation(final PropertyChangeEvent event) {
 		return super.affectsTextPresentation(event) || fCodeScanner.affectsBehavior(event)
-				|| jsxScanner.affectsBehavior(event);
+				|| jsxScanner.affectsBehavior(event)
+				|| TypeScriptUIPreferenceConstants.USE_TEXMATE_FOR_SYNTAX_COLORING.equals(event.getProperty());
 	}
 
 	@Override