NPE guard and error log. More robust files lookup.

TypeFox · Jan 15, 2024 · 77bd34b · 77bd34b
1 parent a64c831
commit 77bd34b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/yang-lsp/io.typefox.yang/src/main/java/io/typefox/yang/processor/YangProcessor.java b/yang-lsp/io.typefox.yang/src/main/java/io/typefox/yang/processor/YangProcessor.java
@@ -192,6 +192,11 @@ protected void processDeviate(Deviate deviate, AbstractModule module, ProcessedD
 			}
 			break;
 		case "not-supported":
+			if (targetNode.eContainer() == null) {
+				processedModel.addProcessorError(moduleFileName(module), deviation.getReference(),
+						"Deviation target node has no apparent.");
+				break;
+			}
 			Object eGet = targetNode.eContainer().eGet(targetNode.eContainingFeature(), true);
 			if (eGet instanceof EList) {
 				((EList<?>) eGet).remove(targetNode);

diff --git a/yang-lsp/io.typefox.yang/src/main/java/io/typefox/yang/processor/YangProcessorApp.java b/yang-lsp/io.typefox.yang/src/main/java/io/typefox/yang/processor/YangProcessorApp.java
@@ -139,7 +139,9 @@ private static List<AbstractModule> loadModuleFileAndDependencies(List<String> m
 			if (!extensionProvider.getFileExtensions().isEmpty())
 				fileExts = extensionProvider.getFileExtensions();
 		}
-		loadAdditionalFiles(implicitLookup, rs, fileExts, false);
+		if(implicitLookup.canRead() && implicitLookup.isDirectory()) {
+			loadAdditionalFiles(implicitLookup, rs, fileExts, false);
+		}
 
 		// handle --path argument
 		if (paths != null) {
@@ -149,8 +151,9 @@ private static List<AbstractModule> loadModuleFileAndDependencies(List<String> m
 					System.err.println("Path " + folder.getAbsolutePath() + " doesn't exist. Skipped.");
 				} else if (!folder.isDirectory()) {
 					System.err.println("Path " + folder.getAbsolutePath() + " is not a directory. Skipped.");
+				} else {
+					loadAdditionalFiles(folder.getAbsoluteFile(), rs, fileExts, !noPathRecurse);
 				}
-				loadAdditionalFiles(folder.getAbsoluteFile(), rs, fileExts, !noPathRecurse);
 			}
 		}
 
@@ -174,14 +177,18 @@ private static List<AbstractModule> loadModuleFileAndDependencies(List<String> m
 
 	private static void loadAdditionalFiles(File parent, XtextResourceSet rs, Set<String> fileExtensions,
 			final boolean recursive) {
-		for (File file : parent.listFiles()) {
+		File[] files = parent.listFiles();
+		if(files == null) {
+			return;
+		}
+		for (File file : files) {
 			URI fileURI = URI.createFileURI(file.getAbsolutePath());
 			if (file.isFile() && fileExtensions.contains(fileURI.fileExtension())) {
 				if (rs.getResource(fileURI, false) == null) {
 					rs.getResource(fileURI, true);
 				}
 			}
-			if (recursive && file.isDirectory()) {
+			if (recursive && file.canRead() && file.isDirectory()) {
 				loadAdditionalFiles(file, rs, fileExtensions, recursive);
 			}
 		}