averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[IDE/SyntaxModel] Make sure to properly annotate comment markers in single-line comment blocks

Browse Source 
rdar://51893731
This commit is contained in:
Argyrios Kyrtzidis
2019-06-24 12:19:12 -07:00
parent 747c69c1ba
commit dbc35b4531
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/IDE/SyntaxModel.cpp
View File

@@ -1272,6 +1272,10 @@ bool ModelASTWalker::processComment(CharSourceRange Range) {
if (NewLinePos != StringRef::npos) { if (NewLinePos != StringRef::npos) {
Text = Text.substr(0, NewLinePos); Text = Text.substr(0, NewLinePos);
} }
if (Text.endswith("*/")) {
Text = Text.drop_back(2);
}
Text = Text.rtrim();
CharSourceRange BeforeMarker{ SM, Range.getStart(), Loc }; CharSourceRange BeforeMarker{ SM, Range.getStart(), Loc };
CharSourceRange Marker(Loc, Text.size()); CharSourceRange Marker(Loc, Text.size());

4
test/IDE/coloring_comments.swift
View File

@@ -36,9 +36,9 @@ func f(x: Int) -> Int {
/* FIXME: blah*/ /* FIXME: blah */
// CHECK: <comment-block>/* <comment-marker>FIXME: blah*/</comment-marker></comment-block> // CHECK: <comment-block>/* <comment-marker>FIXME: blah</comment-marker> */</comment-block>
/* /*
* FIXME: blah * FIXME: blah