Skip to content
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

Jump to bottom

Fix scaladoc tool on JDK 11 with -release 8: Exclude sig files in Symbol.sourceFile #8849

Merged
merged 1 commit into from May 8, 2020
Merged

Fix scaladoc tool on JDK 11 with -release 8: Exclude sig files in Symbol.sourceFile #8849

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/reflect/scala/reflect/internal/Symbols.scala
View file
Open in desktop
Expand Up @@ -2567,7 +2567,11 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
// return actual source code.) So sourceFile has classfiles filtered out.
final def sourceFile: AbstractFile = {
val file = associatedFile
if ((file eq NoAbstractFile) || (file.path endsWith ".class")) null else file
if (
(file eq NoAbstractFile) || {
val path = file.path
path.endsWith(".class") || path.endsWith(".sig")
Copy link
Member

@dwijnand dwijnand May 1, 2020 •
edited

Choose a reason for hiding this comment

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

Aka FileUtils.endsClass(file.path).

But you'd have to copy/move that from src/compiler's FileUtils to src/reflect's...

}) null else file
}

/** Overridden in ModuleSymbols to delegate to the module class.
Expand Down