Validate ts files according the tsconfig.json (files and exclude). See

#40

Author: angelozerr

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

@@ -14,6 +14,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.util.List;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -28,6 +29,10 @@ public class TsconfigJson {
 
 	private boolean compileOnSave;
 
+	private List<String> files;
+
+	private List<String> exclude;
+
 	public boolean isCompileOnSave() {
 		return compileOnSave;
 	}
@@ -36,28 +41,50 @@ public void setCompileOnSave(boolean compileOnSave) {
 		this.compileOnSave = compileOnSave;
 	}
 
+	public List<String> getFiles() {
+		return files;
+	}
+
+	public void setFiles(List<String> files) {
+		this.files = files;
+	}
+
+	public boolean hasFiles() {
+		return files != null;
+	}
+
+	public List<String> getExclude() {
+		return exclude;
+	}
+
+	public void setExclude(List<String> exclude) {
+		this.exclude = exclude;
+	}
+
+	public boolean hasExclude() {
+		return exclude != null;
+	}
+
 	/**
 	 * Load tsconfig.json instance from the given reader.
 	 * 
 	 * @param reader
 	 * @return tsconfig.json instance from the given reader.
 	 */
 	public static TsconfigJson load(Reader reader) {
+		return load(reader, TsconfigJson.class);
+	}
+
+	public static <T extends TsconfigJson> T load(Reader json, Class<T> classOfT) {
 		Gson gson = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
-		return gson.fromJson(reader, TsconfigJson.class);
+		return gson.fromJson(json, classOfT);
 	}
 
-	/**
-	 * Load tsconfig.json instance from the given input stream.
-	 * 
-	 * @param in
-	 * @return tsconfig.json instance from the given input stream
-	 */
-	public static TsconfigJson load(InputStream in) {
+	public static <T extends TsconfigJson> T load(InputStream in, Class<T> classOfT) {
 		Reader isr = null;
 		try {
 			isr = new InputStreamReader(in);
-			return load(isr);
+			return load(isr, classOfT);
 		} finally {
 			if (isr != null) {
 				try {
@@ -68,4 +95,14 @@ public static TsconfigJson load(InputStream in) {
 		}
 	}
 
+	/**
+	 * Load tsconfig.json instance from the given input stream.
+	 * 
+	 * @param in
+	 * @return tsconfig.json instance from the given input stream
+	 */
+	public static TsconfigJson load(InputStream in) {
+		return load(in, TsconfigJson.class);
+	}
+
 }

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/core/resources/jsconfig/IDETsconfigJson.java

@@ -0,0 +1,88 @@
+/**
+ *  Copyright (c) 2015-2016 Angelo ZERR.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Angelo Zerr <[email protected]> - initial API and implementation
+ */
+package ts.eclipse.ide.core.resources.jsconfig;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+
+import ts.resources.jsonconfig.TsconfigJson;
+
+/**
+ * tsconfig.json loadef from {@link IFile} tsconfig.json.
+ * 
+ * @author azerr
+ *
+ */
+public class IDETsconfigJson extends TsconfigJson {
+
+	private IFile tsconfigFile;
+
+	public IFile getTsconfigFile() {
+		return tsconfigFile;
+	}
+
+	public static IDETsconfigJson load(IFile tsconfigFile) throws CoreException {
+		IDETsconfigJson tsconfig = load(tsconfigFile.getContents(), IDETsconfigJson.class);
+		tsconfig.tsconfigFile = tsconfigFile;
+		return tsconfig;
+	}
+
+	/**
+	 * Returns true if the given file is declared in the "files" section and
+	 * false otherwise.
+	 * 
+	 * @param resource
+	 * @return true if the given file is declared in the "files" section and
+	 *         false otherwise.
+	 */
+	public boolean isInFiles(IResource resource) {
+		if (!hasFiles()) {
+			return false;
+		}
+		String filename = getRelativePath(resource);
+		return getFiles().contains(filename);
+	}
+
+	/**
+	 * Returns true if the given resource is excluded (declared as "exclude"
+	 * section) and false otherwise.
+	 * 
+	 * @param resource
+	 * @return true if the given resource is excluded (declared as "exclude"
+	 *         section) and false otherwise.
+	 */
+	public boolean isExcluded(IResource resource) {
+		if (!hasExclude()) {
+			return false;
+		}
+		String filename = getRelativePath(resource);
+		for (String exclude : getExclude()) {
+			if (filename.startsWith(exclude)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Returns the relative path of teh given resource to tsconfig.json folder.
+	 * 
+	 * @param resource
+	 * @return the relative path of teh given resource to tsconfig.json folder.
+	 */
+	private String getRelativePath(IResource resource) {
+		IPath path = resource.getLocation().makeRelativeTo(tsconfigFile.getParent().getLocation());
+		return path.toString();
+	}
+
+}

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/core/utils/WorkbenchResourceUtil.java

@@ -1,27 +1,28 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2016 Red Hat, Inc. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ *  Copyright (c) 2015-2016 Angelo ZERR.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
  *
- * 	Contributors:
- * 		 Red Hat Inc. - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ *  Contributors:
+ *  Angelo Zerr <[email protected]> - initial API and implementation
+ */
 package ts.eclipse.ide.core.utils;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
 
 /**
  * Utilities for Eclipse resources.
  *
  */
 public class WorkbenchResourceUtil {
 
-	public static IFile findFileRecursively(IResource resource, String name) throws CoreException {
+	public static IFile findFileRecursively(IResource resource, IPath name) throws CoreException {
 		IContainer parent = getContainer(resource);
 		return findFileRecursively(parent, name);
 	}
@@ -33,17 +34,14 @@ private static IContainer getContainer(IResource resource) {
 		return resource.getParent();
 	}
 
-	public static IFile findFileRecursively(IContainer container, String name) throws CoreException {
-		for (IResource r : container.members()) {
-			if (r instanceof IContainer) {
-				IFile file = findFileRecursively((IContainer) r, name);
-				if (file != null && file.exists()) {
-					return file;
-				}
-			} else if (r instanceof IFile && r.getName().equals(name) && r.exists()) {
-				return (IFile) r;
-			}
+	public static IFile findFileRecursively(IContainer container, IPath name) throws CoreException {
+		if (container == null) {
+			return null;
+		}
+		IFile file = container.getFile(name);
+		if (file != null && file.exists()) {
+			return file;
 		}
-		return null;
+		return findFileRecursively(container.getParent(), name);
 	}
 }

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

@@ -26,6 +26,7 @@
 import ts.eclipse.ide.core.resources.IIDETypeScriptFile;
 import ts.eclipse.ide.core.resources.IIDETypeScriptProject;
 import ts.eclipse.ide.core.resources.IIDETypeScriptProjectSettings;
+import ts.eclipse.ide.core.resources.jsconfig.IDETsconfigJson;
 import ts.eclipse.ide.core.resources.watcher.IFileWatcherListener;
 import ts.eclipse.ide.core.resources.watcher.ProjectWatcherListenerAdapter;
 import ts.eclipse.ide.internal.core.Trace;
@@ -191,9 +192,14 @@ public IIDETypeScriptProjectSettings getProjectSettings() {
 	@Override
 	public boolean canValidate(IResource resource) {
 		try {
-			TsconfigJson tsconfig = JsonConfigResourcesManager.getInstance().findTsconfig(resource);
+			IDETsconfigJson tsconfig = JsonConfigResourcesManager.getInstance().findTsconfig(resource);
 			if (tsconfig != null) {
-				// TODO: check exclude + files
+				// 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);
+				}
 			}
 		} catch (CoreException e) {
 			Trace.trace(Trace.SEVERE, "Error while getting tsconfig.json for canValidate", e);

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

@@ -16,9 +16,11 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
 
+import ts.eclipse.ide.core.resources.jsconfig.IDETsconfigJson;
 import ts.eclipse.ide.core.utils.WorkbenchResourceUtil;
-import ts.resources.jsonconfig.TsconfigJson;
 import ts.utils.FileUtils;
 
 /**
@@ -29,16 +31,23 @@ public class JsonConfigResourcesManager {
 
 	private static final JsonConfigResourcesManager INSTANCE = new JsonConfigResourcesManager();
 
+	private static final IPath TSCONFIG_JSON_PATH = new Path(FileUtils.TSCONFIG_JSON);
+
 	public static JsonConfigResourcesManager getInstance() {
 		return INSTANCE;
 	}
 
-	private final Map<IFile, TsconfigJson> jsconConfig;
+	private final Map<IFile, IDETsconfigJson> jsconConfig;
 
 	public JsonConfigResourcesManager() {
-		this.jsconConfig = new HashMap<IFile, TsconfigJson>();
+		this.jsconConfig = new HashMap<IFile, IDETsconfigJson>();
 	}
 
+	/**
+	 * Remove the given tsconfig.json from the cache.
+	 * 
+	 * @param file
+	 */
 	public void remove(IFile file) {
 		synchronized (jsconConfig) {
 			jsconConfig.remove(file);
@@ -53,29 +62,43 @@ public void remove(IFile file) {
 	 * @return
 	 * @throws CoreException
 	 */
-	public TsconfigJson findTsconfig(IResource resource) throws CoreException {
-		IFile tsconfigFile = WorkbenchResourceUtil.findFileRecursively(resource, FileUtils.TSCONFIG_JSON);
+	public IDETsconfigJson findTsconfig(IResource resource) throws CoreException {
+		IFile tsconfigFile = WorkbenchResourceUtil.findFileRecursively(resource, TSCONFIG_JSON_PATH);
 		if (tsconfigFile != null) {
 			return getTsconfig(tsconfigFile);
 		}
 		return null;
 	}
 
-	private TsconfigJson getTsconfig(IFile tsconfigFile) throws CoreException {
-		TsconfigJson tsconfig = jsconConfig.get(tsconfigFile);
+	/**
+	 * Returns the Pojo of the given tsconfig.json file.
+	 * 
+	 * @param tsconfigFile
+	 * @return the Pojo of the given tsconfig.json file.
+	 * @throws CoreException
+	 */
+	private IDETsconfigJson getTsconfig(IFile tsconfigFile) throws CoreException {
+		IDETsconfigJson tsconfig = jsconConfig.get(tsconfigFile);
 		if (tsconfig == null) {
 			return createTsConfig(tsconfigFile);
 		}
 		return tsconfig;
 	}
 
-	private synchronized TsconfigJson createTsConfig(IFile tsconfigFile) throws CoreException {
-		TsconfigJson tsconfig = jsconConfig.get(tsconfigFile);
+	/**
+	 * Create Pojo instance of the given tsconfig.json file.
+	 * 
+	 * @param tsconfigFile
+	 * @return Pojo instance of the given tsconfig.json file.
+	 * @throws CoreException
+	 */
+	private synchronized IDETsconfigJson createTsConfig(IFile tsconfigFile) throws CoreException {
+		IDETsconfigJson tsconfig = jsconConfig.get(tsconfigFile);
 		if (tsconfig != null) {
 			return tsconfig;
 		}
 
-		tsconfig = TsconfigJson.load(tsconfigFile.getContents());
+		tsconfig = IDETsconfigJson.load(tsconfigFile);
 		synchronized (jsconConfig) {
 			jsconConfig.put(tsconfigFile, tsconfig);
 		}