Skip to content

Commit c45fce3

Browse files
authored
Merge pull request #12845 from dotty-staging/backport-bridge-pos
[backport] sbt bridge reporting improvements
2 parents 13942b0 + 3815651 commit c45fce3

File tree

2 files changed

+58
-17
lines changed

2 files changed

+58
-17
lines changed

sbt-bridge/src/dotty/tools/xsbt/PositionBridge.java

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ public Optional<Integer> pointer() {
3939
public Optional<String> pointerSpace() {
4040
return Optional.empty();
4141
}
42+
43+
public String toString() {
44+
return "";
45+
}
4246
};
4347

4448
public PositionBridge(SourcePosition pos, SourceFile src) {
@@ -116,4 +120,58 @@ public Optional<String> pointerSpace() {
116120
result.append(lineContent.charAt(i) == '\t' ? '\t' : ' ');
117121
return Optional.of(result.toString());
118122
}
123+
124+
@Override
125+
public String toString() {
126+
return pos.toString();
127+
}
128+
129+
@Override
130+
public Optional<Integer> startOffset() {
131+
if (src.content().length == 0)
132+
return Optional.empty();
133+
else
134+
return Optional.of(pos.start());
135+
}
136+
137+
@Override
138+
public Optional<Integer> endOffset() {
139+
if (src.content().length == 0)
140+
return Optional.empty();
141+
else
142+
return Optional.of(pos.end());
143+
}
144+
145+
@Override
146+
public Optional<Integer> startLine() {
147+
if (src.content().length == 0)
148+
return Optional.empty();
149+
else
150+
return Optional.of(pos.startLine() + 1);
151+
}
152+
153+
@Override
154+
public Optional<Integer> endLine() {
155+
if (src.content().length == 0)
156+
return Optional.empty();
157+
else
158+
return Optional.of(pos.endLine() + 1);
159+
}
160+
161+
@Override
162+
public Optional<Integer> startColumn() {
163+
if (src.content().length == 0)
164+
return Optional.empty();
165+
else
166+
return Optional.of(pos.startColumn());
167+
}
168+
169+
@Override
170+
public Optional<Integer> endColumn() {
171+
if (src.content().length == 0)
172+
return Optional.empty();
173+
else
174+
return Optional.of(pos.endColumn());
175+
}
176+
119177
}

tests/neg/i12640.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)