Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug in UriUtil.normalize and add some test cases for it.

Browse Source
This commit is contained in:
Kris De Volder
2018-05-10 15:15:31 -07:00
parent bf7e0068e0
commit ecc2724822
8 changed files with 178 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/ResourceListener.java
View File

@@ -11,6 +11,7 @@
package org.springframework.tooling.boot.ls;
import java.net.URI;
import java.nio.file.Path;
import java.nio.file.PathMatcher;
import java.util.ArrayList;
import java.util.List;
@@ -20,6 +21,7 @@ import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.lsp4e.LSPEclipseUtils;
import org.eclipse.lsp4j.DidChangeWatchedFilesParams;
import org.eclipse.lsp4j.FileChangeType;
@@ -79,7 +81,12 @@ public class ResourceListener implements IResourceChangeListener {
}
private boolean isApplicableFile(IFile resource) {
return pathMatchers.stream().filter(m -> m.matches(resource.getLocation().toFile().toPath())).findFirst().isPresent();
IPath loc = resource.getLocation();
if (loc!=null) { // Avoid NPE for resource that has no location (happens when project deleted)
Path locPath = resource.getLocation().toFile().toPath();
return pathMatchers.stream().filter(m -> m.matches(locPath)).findFirst().isPresent();
}
return false;
}
private static boolean isRelevantDelta(IResourceDelta delta) {