Skip to content

Commit 80e79b1

Browse files
asgerfhvitved
andauthored
Apply suggestions from code review
Co-authored-by: Tom Hvitved <[email protected]>
1 parent 56ff935 commit 80e79b1

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

shared/util/codeql/util/test/InlineExpectationsTest.qll

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ module TestPostProcessing {
659659
private string getRelativePathTo(string absolutePath) {
660660
exists(Input::Location loc |
661661
loc.hasLocationInfo(absolutePath, _, _, _, _) and
662-
result = Input2::getRelativeUrl(loc).splitAt(":", 0)
662+
parseLocationString(Input2::getRelativeUrl(loc), result, _, _, _, _)
663663
)
664664
}
665665

@@ -692,7 +692,7 @@ module TestPostProcessing {
692692

693693
abstract string getRelativeUrl();
694694

695-
abstract string toString();
695+
final string toString() { result = this.getRelativeUrl() }
696696

697697
abstract predicate hasLocationInfo(string file, int sl, int sc, int el, int ec);
698698
}
@@ -731,12 +731,10 @@ module TestPostProcessing {
731731
module TestImpl2 implements InlineExpectationsTestSig {
732732
final class Location = TestLocation;
733733

734-
class ExpectationComment instanceof Input::ExpectationComment {
735-
string getContents() { result = super.getContents() }
734+
final private class ExpectationCommentFinal = Input::ExpectationComment;
736735

736+
class ExpectationComment extends ExpectationCommentFinal {
737737
Location getLocation() { result = MkInputLocation(super.getLocation()) }
738-
739-
string toString() { result = super.toString() }
740738
}
741739
}
742740

0 commit comments

Comments
 (0)