failure to parse a specific file should not cause the failure of apex…

… completion in other project files
neowit · Dec 29, 2014 · 46b946d · 46b946d
1 parent c0fac6d
commit 46b946d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/src/main/scala/com/neowit/apex/parser/SourceScanner.scala b/src/main/scala/com/neowit/apex/parser/SourceScanner.scala
@@ -29,16 +29,25 @@ class SourceScanner (files: List[File]) extends Logging {
             if (completeScan || file.lastModified() > lastModifiedTime) {
                 logger.debug("scanning file: " + file.getName)
 
-                val tokens = new CommonTokenStream(getLexer(file))
-                val parser = new ApexcodeParser(tokens)
-                ApexParserUtils.removeConsoleErrorListener(parser)
-                 //parser.setErrorHandler(new BailErrorStrategy())
-                 //parser.setErrorHandler(new CompletionErrorStrategy())
-                 val tree = parser.compilationUnit()
-                 val extractor = new TreeListener(parser)
-                 walker.walk(extractor, tree)
-                 completeTree.extend(extractor.getTree)
-                fileModificationTimes.+=(file.getAbsolutePath -> file.lastModified())
+                try {
+                    val tokens = new CommonTokenStream(getLexer(file))
+                    val parser = new ApexcodeParser(tokens)
+                    ApexParserUtils.removeConsoleErrorListener(parser)
+                    //parser.setErrorHandler(new BailErrorStrategy())
+                    //parser.setErrorHandler(new CompletionErrorStrategy())
+                    val tree = parser.compilationUnit()
+                    val extractor = new TreeListener(parser)
+                    walker.walk(extractor, tree)
+                    completeTree.extend(extractor.getTree)
+                    fileModificationTimes.+=(file.getAbsolutePath -> file.lastModified())
+                } catch {
+                    case ex:Exception =>
+                        logger.error("Failed to parse file: " + file.getName, ex)
+                        logger.error(ex.getStackTraceString)
+                        println("Failed to parse file: " + file.getName)
+                        println(ex)
+                        println(ex.getStackTraceString)
+                }
             }
         }
         //println(getTree)

diff --git a/src/main/scala/com/neowit/utils/Logging.scala b/src/main/scala/com/neowit/utils/Logging.scala
@@ -32,7 +32,7 @@ trait Logging {
     def fatal(msg: Any) = if (log.isFatalEnabled) log.fatal(msg)
     def fatal(msg: Any, ex: Throwable) = if (log.isFatalEnabled) log.fatal(msg, ex)
 
-    def error(msg: Any) = if (log.isInfoEnabled) log.error(msg)
+    def error(msg: Any) = if (log.isErrorEnabled) log.error(msg)
     def error(msg: Any, ex: Throwable) = if (log.isErrorEnabled) log.error(msg, ex)
 
     def warn(msg: Any) = if (log.isWarnEnabled) log.warn(msg)