diff options
| author | Felix Mulder <felix.mulder@gmail.com> | 2016-03-10 14:00:03 +0100 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2016-04-07 08:40:27 +0200 |
| commit | c66998bc56ba73b5b2cbbf6b10f4d5b83017db13 (patch) | |
| tree | f48e25457df90810a6e5f764b2469e52e241e924 /src/dotty/tools/dotc/parsing/Parsers.scala | |
| parent | 3aab803d513cec98dab8a58e92924d96662a7d7d (diff) | |
| download | dotty-c66998bc56ba73b5b2cbbf6b10f4d5b83017db13.tar.gz dotty-c66998bc56ba73b5b2cbbf6b10f4d5b83017db13.tar.bz2 dotty-c66998bc56ba73b5b2cbbf6b10f4d5b83017db13.zip | |
Fix association of docstrings based on posisition
This commit fixes errors that would've occurred in this situation:
```
/** Docstring 1 */ <- this one would've been chosen
/** Docstring 2 */
/** Docstring 3 */
class Class
```
And this situation:
```
/** Docstring 1 */
trait Trait
/** Docstring 2 */ <- this one would've been chosen
```
Diffstat (limited to 'src/dotty/tools/dotc/parsing/Parsers.scala')
| -rw-r--r-- | src/dotty/tools/dotc/parsing/Parsers.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/parsing/Parsers.scala b/src/dotty/tools/dotc/parsing/Parsers.scala index 3ea504657..053b28a64 100644 --- a/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/src/dotty/tools/dotc/parsing/Parsers.scala @@ -1889,7 +1889,7 @@ object Parsers { * | [`case'] `object' ObjectDef */ def tmplDef(start: Int, mods: Modifiers): Tree = { - val docstring = in.getDocString() + val docstring = in.getDocString(start) in.token match { case TRAIT => classDef(posMods(start, addFlag(mods, Trait)), docstring) @@ -2170,7 +2170,7 @@ object Parsers { if (in.token == PACKAGE) { in.nextToken() if (in.token == OBJECT) { - val docstring = in.getDocString() + val docstring = in.getDocString(start) ts += objectDef(atPos(start, in.skipToken()) { Modifiers(Package) }, docstring) if (in.token != EOF) { acceptStatSep() |