Validate JS file only if jsconfig.json is found or

tsconfig.json/compilerOptions/alloyJs = true

Author: angelozerr

core/ts.core/src/ts/resources/jsonconfig/CompilerOptions.java

@@ -0,0 +1,15 @@
+package ts.resources.jsonconfig;
+
+public class CompilerOptions {
+
+	private boolean alloyJs;
+
+	public boolean isAlloyJs() {
+		return alloyJs;
+	}
+
+	public void setAlloyJs(boolean alloyJs) {
+		this.alloyJs = alloyJs;
+	}
+
+}

core/ts.core/src/ts/resources/jsonconfig/TsconfigJson.java

@@ -27,12 +27,22 @@
  */
 public class TsconfigJson {
 
+	private CompilerOptions compilerOptions;
+
 	private boolean compileOnSave;
 
 	private List<String> files;
 
 	private List<String> exclude;
 
+	public void setCompilerOptions(CompilerOptions compilerOptions) {
+		this.compilerOptions = compilerOptions;
+	}
+
+	public CompilerOptions getCompilerOptions() {
+		return compilerOptions;
+	}
+
 	public boolean isCompileOnSave() {
 		return compileOnSave;
 	}

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

@@ -192,28 +192,73 @@ public IIDETypeScriptProjectSettings getProjectSettings() {
 	@Override
 	public boolean canValidate(IResource resource) {
 		try {
+			// Use project preferences, which defines exclude path
 			if (!getProjectSettings().canValidate(resource)) {
 				return false;
 			}
-			IDETsconfigJson tsconfig = JsonConfigResourcesManager.getInstance().findTsconfig(resource);
-			if (tsconfig != null) {
-				// check if the given file is declared in the "files"
-				if (tsconfig.hasFiles()) {
-					return tsconfig.isInFiles(resource);
-				} else if (tsconfig.hasExclude()) {
-					return !tsconfig.isExcluded(resource);
-				}
-			} else {
-				// tsconfig.json was not found (ex : MyProject/node_modules),
-				// validation must not be done.
-				return false;
+			boolean isJSFile = IDEResourcesManager.getInstance().isJsFile(resource)
+					|| IDEResourcesManager.getInstance().isJsxFile(resource);
+			if (isJSFile) {
+				// Can validate js file?
+				return canValidateJsFile(resource);
 			}
+			// Can validate ts file?
+			return canValidateTsFile(resource);
 		} catch (CoreException e) {
 			Trace.trace(Trace.SEVERE, "Error while getting tsconfig.json for canValidate", e);
 		}
 		return true;
 	}
 
+	/**
+	 * Returns true if the given js, jsx file can be validated and false
+	 * otherwise.
+	 * 
+	 * @param resource
+	 * @return true if the given js, jsx file can be validated and false
+	 *         otherwise.
+	 * @throws CoreException
+	 */
+	private boolean canValidateJsFile(IResource resource) throws CoreException {
+		// Search if a jsconfig.json exists?
+		IFile jsconfigFile = JsonConfigResourcesManager.getInstance().findJsconfigFile(resource);
+		if (jsconfigFile != null) {
+			return true;
+		}
+		// Search if tsconfig.json exists and defines alloyJs
+		IDETsconfigJson tsconfig = JsonConfigResourcesManager.getInstance().findTsconfig(resource);
+		if (tsconfig != null && tsconfig.getCompilerOptions() != null && tsconfig.getCompilerOptions().isAlloyJs()) {
+			return true;
+		}
+		// jsconfig.json was not found (ex : MyProject/node_modules),
+		// validation must not be done.
+		return false;
+	}
+
+	/**
+	 * Returns true if the given ts, tsx file can be validated and false
+	 * otherwise.
+	 * 
+	 * @param resource
+	 * @return true if the given ts, tsx file can be validated and false
+	 *         otherwise.
+	 * @throws CoreException
+	 */
+	private boolean canValidateTsFile(IResource resource) throws CoreException {
+		IDETsconfigJson tsconfig = JsonConfigResourcesManager.getInstance().findTsconfig(resource);
+		if (tsconfig != null) {
+			// check if the given file is declared in the "files"
+			if (tsconfig.hasFiles()) {
+				return tsconfig.isInFiles(resource);
+			} else if (tsconfig.hasExclude()) {
+				return !tsconfig.isExcluded(resource);
+			}
+		}
+		// tsconfig.json was not found (ex : MyProject/node_modules),
+		// validation must not be done.
+		return false;
+	}
+
 	@Override
 	public boolean canCompileOnSave(IResource resource) {
 		try {

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/internal/core/resources/jsonconfig/JsonConfigResourcesManager.java

@@ -32,6 +32,7 @@ public class JsonConfigResourcesManager {
 	private static final JsonConfigResourcesManager INSTANCE = new JsonConfigResourcesManager();
 
 	private static final IPath TSCONFIG_JSON_PATH = new Path(FileUtils.TSCONFIG_JSON);
+	private static final IPath JSCONFIG_JSON_PATH = new Path(FileUtils.JSCONFIG_JSON);
 
 	public static JsonConfigResourcesManager getInstance() {
 		return INSTANCE;
@@ -63,13 +64,18 @@ public void remove(IFile file) {
 	 * @throws CoreException
 	 */
 	public IDETsconfigJson findTsconfig(IResource resource) throws CoreException {
-		IFile tsconfigFile = WorkbenchResourceUtil.findFileInContainerOrParent(resource, TSCONFIG_JSON_PATH);
+		IFile tsconfigFile = findTsconfigFile(resource);
 		if (tsconfigFile != null) {
 			return getTsconfig(tsconfigFile);
 		}
 		return null;
 	}
 
+	public IFile findTsconfigFile(IResource resource) throws CoreException {
+		IFile tsconfigFile = WorkbenchResourceUtil.findFileInContainerOrParent(resource, TSCONFIG_JSON_PATH);
+		return tsconfigFile;
+	}
+
 	/**
 	 * Returns the Pojo of the given tsconfig.json file.
 	 * 
@@ -105,4 +111,15 @@ private synchronized IDETsconfigJson createTsConfig(IFile tsconfigFile) throws C
 		return tsconfig;
 	}
 
+	/**
+	 * Find jsconfig.json
+	 * 
+	 * @param resource
+	 * @return
+	 * @throws CoreException
+	 */
+	public IFile findJsconfigFile(IResource resource) throws CoreException {
+		return WorkbenchResourceUtil.findFileInContainerOrParent(resource, JSCONFIG_JSON_PATH);
+	}
+
 }