Danny Tuppeny
f7e288e3ad
Previously we could return "invalid path" responses for any non-Dart files. This allows clients to send requests for other files and just successful (though empty) responses. Change-Id: I192e83ac2ebd2124c03c22e3e048a066cfd33f17 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/101990 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Danny Tuppeny <dantup@google.com>
122 lines
3.3 KiB
Dart
122 lines
3.3 KiB
Dart
// Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file
|
|
// for details. All rights reserved. Use of this source code is governed by a
|
|
// BSD-style license that can be found in the LICENSE file.
|
|
|
|
import 'package:analysis_server/lsp_protocol/protocol_generated.dart';
|
|
import 'package:test/test.dart';
|
|
import 'package:test_reflective_loader/test_reflective_loader.dart';
|
|
|
|
import 'server_abstract.dart';
|
|
|
|
main() {
|
|
defineReflectiveSuite(() {
|
|
defineReflectiveTests(FoldingTest);
|
|
});
|
|
}
|
|
|
|
@reflectiveTest
|
|
class FoldingTest extends AbstractLspAnalysisServerTest {
|
|
test_class() async {
|
|
final content = '''
|
|
class MyClass2 {[[
|
|
// Class content
|
|
]]}
|
|
''';
|
|
|
|
final range1 = rangeFromMarkers(content);
|
|
final expectedRegions = [
|
|
new FoldingRange(
|
|
range1.start.line,
|
|
range1.start.character,
|
|
range1.end.line,
|
|
range1.end.character,
|
|
null,
|
|
)
|
|
];
|
|
|
|
await initialize();
|
|
await openFile(mainFileUri, withoutMarkers(content));
|
|
|
|
final regions = await getFoldingRegions(mainFileUri);
|
|
expect(regions, unorderedEquals(expectedRegions));
|
|
}
|
|
|
|
test_comments() async {
|
|
final content = '''
|
|
[[/// This is a comment
|
|
/// that spans many lines]]
|
|
class MyClass2 {}
|
|
''';
|
|
|
|
final range1 = rangeFromMarkers(content);
|
|
final expectedRegions = [
|
|
new FoldingRange(
|
|
range1.start.line,
|
|
range1.start.character,
|
|
range1.end.line,
|
|
range1.end.character,
|
|
FoldingRangeKind.Comment,
|
|
)
|
|
];
|
|
|
|
await initialize();
|
|
await openFile(mainFileUri, withoutMarkers(content));
|
|
|
|
final regions = await getFoldingRegions(mainFileUri);
|
|
expect(regions, unorderedEquals(expectedRegions));
|
|
}
|
|
|
|
test_nonDartFile() async {
|
|
await initialize();
|
|
await openFile(pubspecFileUri, simplePubspecContent);
|
|
|
|
final regions = await getFoldingRegions(pubspecFileUri);
|
|
expect(regions, isEmpty);
|
|
}
|
|
|
|
test_headersImportsComments() async {
|
|
// TODO(dantup): Review why the file header and the method comment ranges
|
|
// are different... one spans only the range to collapse, but the other
|
|
// just starts at the logical block.
|
|
// The LSP spec doesn't give any guidance on whether the first part of
|
|
// the surrounded content should be visible or not after folding
|
|
// so we'll need to revisit this once there's clarification:
|
|
// https://github.com/Microsoft/language-server-protocol/issues/659
|
|
final content = '''
|
|
// Copyright some year by some people[[
|
|
// See LICENCE etc.]]
|
|
|
|
import[[ 'dart:io';
|
|
import 'dart:async';]]
|
|
|
|
[[/// This is not the file header
|
|
/// It's just a comment]]
|
|
main() {}
|
|
''';
|
|
|
|
final ranges = rangesFromMarkers(content);
|
|
|
|
final expectedRegions = [
|
|
_toFoldingRange(ranges[0], FoldingRangeKind.Comment),
|
|
_toFoldingRange(ranges[1], FoldingRangeKind.Imports),
|
|
_toFoldingRange(ranges[2], FoldingRangeKind.Comment),
|
|
];
|
|
|
|
await initialize();
|
|
await openFile(mainFileUri, withoutMarkers(content));
|
|
|
|
final regions = await getFoldingRegions(mainFileUri);
|
|
expect(regions, unorderedEquals(expectedRegions));
|
|
}
|
|
|
|
FoldingRange _toFoldingRange(Range range, FoldingRangeKind kind) {
|
|
return new FoldingRange(
|
|
range.start.line,
|
|
range.start.character,
|
|
range.end.line,
|
|
range.end.character,
|
|
kind,
|
|
);
|
|
}
|
|
}
|