Made proper error for UnknownURI

Author: cmaglie

ls/ls.go

@@ -1106,7 +1106,7 @@ func (ls *INOLanguageServer) didClose(logger jsonrpc.FunctionLogger, inoDidClose
 		delete(ls.trackedIDEDocs, inoIdentifier.URI.AsPath().String())
 	} else {
 		logger.Logf("    didClose of untracked document: %s", inoIdentifier.URI)
-		return nil, unknownURI(inoIdentifier.URI)
+		return nil, &UnknownURI{inoIdentifier.URI}
 	}
 
 	// If we are tracking a .ino...
@@ -1161,7 +1161,7 @@ func (ls *INOLanguageServer) didChange(logger jsonrpc.FunctionLogger, inoDidChan
 	// Apply the change to the tracked sketch file.
 	trackedInoID := inoDoc.URI.AsPath().String()
 	if doc, ok := ls.trackedIDEDocs[trackedInoID]; !ok {
-		return nil, unknownURI(inoDoc.URI)
+		return nil, &UnknownURI{inoDoc.URI}
 	} else if updatedDoc, err := textedits.ApplyLSPTextDocumentContentChangeEvent(doc, inoDidChangeParams); err != nil {
 		return nil, err
 	} else {
@@ -1446,6 +1446,10 @@ func (ls *INOLanguageServer) cpp2inoDocumentSymbols(logger jsonrpc.FunctionLogge
 	return inoSymbols
 }
 
-func unknownURI(uri lsp.DocumentURI) error {
-	return errors.New("Document is not available: " + uri.String())
+type UnknownURI struct {
+	URI lsp.DocumentURI
+}
+
+func (e *UnknownURI) Error() string {
+	return "Document is not available: " + e.URI.String()
 }

ls/ls_ide_to_clang.go

@@ -18,7 +18,7 @@ func (ls *INOLanguageServer) idePathToIdeURI(logger jsonrpc.FunctionLogger, inoP
 			logger.Logf("    !!! > %s", p)
 		}
 		uri := lsp.NewDocumentURI(inoPath)
-		return uri, unknownURI(uri)
+		return uri, &UnknownURI{uri}
 	}
 	return doc.URI, nil
 }
@@ -42,7 +42,7 @@ func (ls *INOLanguageServer) ide2ClangDocumentURI(logger jsonrpc.FunctionLogger,
 	inside, err := idePath.IsInsideDir(ls.sketchRoot)
 	if err != nil {
 		logger.Logf("ERROR: could not determine if '%s' is inside '%s'", idePath, ls.sketchRoot)
-		return lsp.NilURI, unknownURI(ideURI)
+		return lsp.NilURI, &UnknownURI{ideURI}
 	}
 	if !inside {
 		clangURI := ideURI
@@ -79,7 +79,7 @@ func (ls *INOLanguageServer) ide2ClangTextDocumentPositionParams(logger jsonrpc.
 			clangPosition.Line = cppLine
 		} else {
 			logger.Logf("%s -> invalid line requested: %s:%d", ideParams, ideURI, idePosition.Line)
-			return lsp.TextDocumentPositionParams{}, unknownURI(ideURI)
+			return lsp.TextDocumentPositionParams{}, &UnknownURI{ideURI}
 		}
 	}
 	clangParams := lsp.TextDocumentPositionParams{