Syntax color for TypeScript keywords + ES7 decorator. Fix

#76

Author: angelozerr

eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/ITypeScriptThemeConstants.java

@@ -22,6 +22,13 @@ public interface ITypeScriptThemeConstants {
 
 	String ID_PREFIX = JSDTTypeScriptUIPlugin.PLUGIN_ID + "."; //$NON-NLS-1$
 
+	/**
+	 * A theme constant that holds the color used to render JSX tag border
+	 * constants.
+	 */
+	public final String EDITOR_TYPESCRIPT_DECORATOR_COLOR = ID_PREFIX
+			+ PreferenceConstants.EDITOR_TYPESCRIPT_DECORATOR_COLOR;
+
 	/**
 	 * A theme constant that holds the color used to render JSX tag border
 	 * constants.
@@ -47,4 +54,5 @@ public interface ITypeScriptThemeConstants {
 	 */
 	public final String EDITOR_JSX_TAG_ATTRIBUTE_VALUE_COLOR = ID_PREFIX
 			+ PreferenceConstants.EDITOR_JSX_TAG_ATTRIBUTE_VALUE_COLOR;
+
 }

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

@@ -50,6 +50,7 @@
 import ts.eclipse.ide.jsdt.internal.ui.editor.contentassist.TypeScriptCompletionProcessor;
 import ts.eclipse.ide.jsdt.internal.ui.editor.contentassist.TypeScriptJavadocCompletionProcessor;
 import ts.eclipse.ide.jsdt.internal.ui.editor.format.TypeScriptContentFormatter;
+import ts.eclipse.ide.jsdt.internal.ui.text.TypeScriptCodeScanner;
 import ts.eclipse.ide.jsdt.internal.ui.text.jsx.IJSXPartitions;
 import ts.eclipse.ide.jsdt.internal.ui.text.jsx.JSXScanner;
 import ts.eclipse.ide.jsdt.ui.actions.ITypeScriptEditorActionDefinitionIds;
@@ -64,6 +65,12 @@
  */
 public class TypeScriptSourceViewerConfiguration extends JavaScriptSourceViewerConfiguration {
 
+	/**
+	 * The TypeScript source code scanner.
+	 *
+	 */
+	private AbstractJavaScanner fCodeScanner;
+
 	/**
 	 * The JSX source scanner.
 	 *
@@ -73,6 +80,7 @@ public class TypeScriptSourceViewerConfiguration extends JavaScriptSourceViewerC
 	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);
 
 	}
@@ -336,17 +344,36 @@ public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceVie
 
 	}
 
+	/**
+	 * Returns the TypeScript source code scanner for this configuration.
+	 *
+	 * @return the TypeScript source code scanner
+	 */
+	@Override
+	protected RuleBasedScanner getCodeScanner() {
+		return fCodeScanner;
+	}
+
+	/**
+	 * Returns the JSX source code scanner for this configuration.
+	 *
+	 * @return the JSX source code scanner
+	 */
 	protected RuleBasedScanner getJSXScanner() {
 		return jsxScanner;
 	}
 
 	public boolean affectsTextPresentation(final PropertyChangeEvent event) {
-		return super.affectsTextPresentation(event) || jsxScanner.affectsBehavior(event);
+		return super.affectsTextPresentation(event) || fCodeScanner.affectsBehavior(event)
+				|| jsxScanner.affectsBehavior(event);
 	}
 
 	@Override
 	public void handlePropertyChangeEvent(final PropertyChangeEvent event) {
 		super.handlePropertyChangeEvent(event);
+		if (fCodeScanner.affectsBehavior(event)) {
+			fCodeScanner.adaptToPreferenceChange(event);
+		}
 		if (jsxScanner.affectsBehavior(event)) {
 			jsxScanner.adaptToPreferenceChange(event);
 		}

eclipse/jsdt/ts.eclipse.ide.jsdt.ui/src/ts/eclipse/ide/jsdt/internal/ui/text/ITypeScriptColorConstants.java

@@ -0,0 +1,6 @@
+package ts.eclipse.ide.jsdt.internal.ui.text;
+
+public interface ITypeScriptColorConstants {
+
+	public static final String DECORATOR = "decorator"; //$NON-NLS-1$
+}