Skip to content

Fix an issue when trying to resolve an non source file #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 1, 2019
Merged

Fix an issue when trying to resolve an non source file #101

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d967c3
Fix an issue when trying to resolve an non source file
deltatre-johann Mar 27, 2019
a8fafc4
Change logging level in case of exceptions
deltatre-johann Mar 29, 2019
fbe2e19
No more capture all exceptions
deltatre-johann Apr 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion server/src/main/kotlin/org/javacs/kt/SourceFiles.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,13 @@ class SourceFiles(private val sp: SourcePath) {
private fun readFromDisk(file: Path): SourceVersion? {
if (!Files.exists(file)) return null

val content = Files.readAllLines(file).joinToString("\n")
var content = ""

try {
content = Files.readAllLines(file).joinToString("\n")
Copy link

@matthewmcgarvey matthewmcgarvey Mar 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will be cleaner if you return from this line instead of saving the file contents to a variable

Copy link
Owner

@fwcd fwcd Mar 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Storing the contents in a variable is fine IMO. Since the string is going to be wrapped into a SourceVersion anyway, having two returns would entail some code duplication.

} catch(exception: IOException) {
LOG.warn("Exception while parsing source file : ${file.toFile().absolutePath}")
}

return SourceVersion(content, -1)
}
Expand Down