Skip to content

Commit d4ddb49

Browse files
committed
Improve decodeIllegalChars
1 parent 4a55c5a commit d4ddb49

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

compiler/src/dotty/tools/dotc/interactive/Completion.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ object Completion {
214214
addAccessibleMembers(qual.tpe)
215215
if (!mode.is(Mode.Import) && !qual.tpe.isRef(defn.NullClass)) {
216216
// Implicit conversions do not kick in when importing
217+
// and for `NullClass` they produce unapplicable completions (for unclear reasons)
217218
implicitConversionTargets(qual)(ctx.fresh.setExploreTyperState())
218219
.foreach(addAccessibleMembers)
219220
}

compiler/src/dotty/tools/dotc/util/NameTransformer.scala

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,15 @@ object NameTransformer {
6060
if (name.contains("$u")) {
6161
val sb = new mutable.StringBuilder()
6262
var i = 0
63-
while (i < name.length - 5) {
64-
if (name(i) == '$' && name(i + 1) == 'u') {
63+
while (i < name.length) {
64+
if (i < name.length - 5 && name(i) == '$' && name(i + 1) == 'u') {
6565
sb.append(Integer.valueOf(name.substring(i + 2, i + 6), 16).toChar)
6666
i += 6
6767
} else {
6868
sb.append(name(i))
6969
i += 1
7070
}
7171
}
72-
while (i < name.length) {
73-
sb.append(name(i))
74-
i += 1
75-
}
7672
sb.result()
7773
}
7874
else name

0 commit comments

Comments
 (0)