Implement WTP Validator with TypeScript gerrr. See

#27

Author: angelozerr

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/core/TypeScriptCorePlugin.java

@@ -36,6 +36,7 @@
 import ts.eclipse.ide.internal.core.resources.watcher.ResourcesWatcher;
 import ts.resources.ConfigurableTypeScriptResourcesManager;
 import ts.resources.TypeScriptResourcesManager;
+import ts.utils.FileUtils;
 
 /**
  * The activator class controls the plug-in life cycle
@@ -210,4 +211,8 @@ public static IResourcesWatcher getResourcesWatcher() {
 		return ResourcesWatcher.getInstance();
 	}
 
+	public static String getFileName(IResource file) {
+		return FileUtils.normalizeSlashes(file.getLocation().toString());
+	}
+
 }

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/internal/core/resources/IDETypeScriptFile.java

@@ -18,11 +18,11 @@
 
 import ts.TypeScriptException;
 import ts.client.Location;
+import ts.eclipse.ide.core.TypeScriptCorePlugin;
 import ts.eclipse.ide.core.resources.IIDETypeScriptFile;
 import ts.eclipse.ide.core.resources.IIDETypeScriptProject;
 import ts.resources.AbstractTypeScriptFile;
 import ts.resources.SynchStrategy;
-import ts.utils.FileUtils;
 
 /**
  * {@link IIDETypeScriptFile} implementation.
@@ -36,17 +36,17 @@ public class IDETypeScriptFile extends AbstractTypeScriptFile implements IIDETyp
 	public IDETypeScriptFile(IResource file, IDocument document, IIDETypeScriptProject tsProject) {
 		super(tsProject);
 		this.file = file;
-		this.document = document;
-		this.document.addDocumentListener(this);
-	}
-
-	public static String getFileName(IResource file) {
-		return FileUtils.normalizeSlashes(file.getLocation().toString());
+		if (document != null) {
+			this.document = document;
+			this.document.addDocumentListener(this);
+		} else {
+			this.document = null;
+		}
 	}
 
 	@Override
 	public String getName() {
-		return getFileName(file);
+		return TypeScriptCorePlugin.getFileName(file);
 	}
 
 	@Override
@@ -84,7 +84,9 @@ public void documentChanged(DocumentEvent event) {
 
 	@Override
 	public void close() throws TypeScriptException {
-		this.document.removeDocumentListener(this);
+		if (this.document != null) {
+			this.document.removeDocumentListener(this);
+		}
 		super.close();
 	}
 
@@ -106,11 +108,17 @@ public Location getLocation(int position) throws TypeScriptException {
 
 	@Override
 	public String getContents() {
-		return document.get();
+		if (document != null) {
+			return document.get();
+		}
+		return null;
 	}
 
 	@Override
 	public int getPosition(int line, int offset) throws TypeScriptException {
+		if (document == null) {
+			return -1;
+		}
 		try {
 			return document.getLineOffset(line - 1) + offset - 1;
 		} catch (BadLocationException e) {

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/internal/core/resources/IDETypeScriptProject.java

@@ -95,7 +95,7 @@ public void load() throws IOException {
 
 	@Override
 	public synchronized IIDETypeScriptFile openFile(IResource file, IDocument document) throws TypeScriptException {
-		String fileName = IDETypeScriptFile.getFileName(file);
+		String fileName = TypeScriptCorePlugin.getFileName(file);
 		IIDETypeScriptFile tsFile = (IIDETypeScriptFile) super.getOpenedFile(fileName);
 		if (tsFile == null) {
 			tsFile = new IDETypeScriptFile(file, document, this);
@@ -108,7 +108,7 @@ public synchronized IIDETypeScriptFile openFile(IResource file, IDocument docume
 
 	@Override
 	public void closeFile(IResource file) throws TypeScriptException {
-		String fileName = IDETypeScriptFile.getFileName(file);
+		String fileName = TypeScriptCorePlugin.getFileName(file);
 		IIDETypeScriptFile tsFile = (IIDETypeScriptFile) super.getOpenedFile(fileName);
 		if (tsFile != null) {
 			tsFile.close();

eclipse/ts.eclipse.ide.validator.core/src/ts/eclipse/ide/validator/core/validation/TypeScriptValidationHelper.java

@@ -11,10 +11,10 @@
 
 public class TypeScriptValidationHelper {
 
-	public static void validate(IIDETypeScriptFile tsFile, ITypeScriptProject tsProject, IReporter reporter,
-			IValidator validator) {
+	public static void validate(IIDETypeScriptFile tsFile, IReporter reporter, IValidator validator) {
 		int delay = 0;
 		try {
+			ITypeScriptProject tsProject = tsFile.getProject();
 			ITypeScriptGeterrCollector collector = new TypeScriptReporterCollector(tsFile, reporter, validator);
 			tsProject.geterr(tsFile, delay, collector);
 		} catch (Exception e) {

eclipse/ts.eclipse.ide.validator.core/src/ts/eclipse/ide/validator/internal/core/validation/TypeScriptValidator.java

@@ -1,21 +1,103 @@
 package ts.eclipse.ide.validator.internal.core.validation;
 
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
 import org.eclipse.wst.validation.AbstractValidator;
+import org.eclipse.wst.validation.ValidationResult;
+import org.eclipse.wst.validation.ValidationState;
 import org.eclipse.wst.validation.internal.core.ValidationException;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
 import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
 import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
 
+import ts.TypeScriptException;
+import ts.eclipse.ide.core.TypeScriptCorePlugin;
+import ts.eclipse.ide.core.resources.IIDETypeScriptFile;
+import ts.eclipse.ide.core.resources.IIDETypeScriptProject;
+import ts.eclipse.ide.validator.core.validation.TypeScriptValidationHelper;
+import ts.eclipse.ide.validator.internal.core.Trace;
+
 /**
  * WTP TypeScript Validator V2 to validate TypeScript. This validator can be
  * called when project is Build or Validate at hand (with Validate context
  * menu).
  */
 public class TypeScriptValidator extends AbstractValidator implements IValidatorJob {
 
+	private static final String TYPESCRIPT_VALIDATOR_CONTEXT = "ts.eclipse.ide.validator.internal.core.validation.validatorContext"; //$NON-NLS-1$
+
+	@Override
+	public void validationStarting(IProject project, ValidationState state, IProgressMonitor monitor) {
+		if (project != null && TypeScriptCorePlugin.hasTypeScriptNature(project)) {
+			try {
+				IIDETypeScriptProject tsProject = TypeScriptCorePlugin.getTypeScriptProject(project, false);
+				state.put(TYPESCRIPT_VALIDATOR_CONTEXT, tsProject);
+				super.validationStarting(project, state, monitor);
+			} catch (CoreException e) {
+				Trace.trace(Trace.SEVERE, "Error while TypeScript start validation.", e);
+			}
+		}
+	}
+
+	@Override
+	public void validationFinishing(IProject project, ValidationState state, IProgressMonitor monitor) {
+		if (project != null && TypeScriptCorePlugin.hasTypeScriptNature(project)) {
+			super.validationFinishing(project, state, monitor);
+			state.put(TYPESCRIPT_VALIDATOR_CONTEXT, null);
+		}
+	}
+
+	/**
+	 * Perform the validation using version 2 of the validation framework.
+	 */
+	@Override
+	public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
+		ValidationResult result = new ValidationResult();
+		IIDETypeScriptProject tsProject = (IIDETypeScriptProject) state.get(TYPESCRIPT_VALIDATOR_CONTEXT);
+		if (tsProject != null && TypeScriptCorePlugin.canConsumeTsserver(resource)) {
+			IReporter reporter = result.getReporter(monitor);
+
+			// Here we call geterr from tsserver for the given file IResource.
+			// geterr works only if file is opened. So we need to open the file
+			// (even if it is not opened in an editor) and close it after.
+			IIDETypeScriptFile tsFile = null;
+			boolean wasOpened = false;
+			try {
+				String fileName = TypeScriptCorePlugin.getFileName(resource);
+				// open ts file if needed
+				tsFile = (IIDETypeScriptFile) tsProject.getOpenedFile(fileName);
+				if (tsFile != null) {
+					wasOpened = true;
+				} else {
+					try {
+						tsFile = tsProject.openFile(resource, null);
+					} catch (TypeScriptException e) {
+						e.printStackTrace();
+					}
+				}
+				if (tsFile != null) {
+					// Validate ts file
+					TypeScriptValidationHelper.validate(tsFile, reporter, this);
+				}
+			} finally {
+				// close ts file if needed
+				if (!wasOpened && tsFile != null) {
+					try {
+						tsFile.close();
+					} catch (TypeScriptException e) {
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+		return result;
+	}
+
 	@Override
 	public void cleanup(IReporter reporter) {
 		// do nothing

eclipse/ts.eclipse.ide.validator.ui/src/ts/eclipse/ide/validator/internal/ui/validation/TypeScriptSourceValidator.java

@@ -50,7 +50,7 @@ public void validate(IValidationContext helper, IReporter reporter) throws Valid
 		try {
 			IIDETypeScriptProject tsProject = TypeScriptCorePlugin.getTypeScriptProject(file.getProject());
 			IIDETypeScriptFile tsFile = tsProject.openFile(file, document);
-			TypeScriptValidationHelper.validate(tsFile, tsProject, reporter, this);
+			TypeScriptValidationHelper.validate(tsFile, reporter, this);
 		} catch (Exception e) {
 			Trace.trace(Trace.SEVERE, "Error while TypeScript validation.", e);
 		}