@@ -35,7 +35,7 @@ class FoldingTest extends AbstractLspAnalysisServerTest {
3535 }) async {
3636 uri ?? = mainFileUri;
3737
38- code = TestCode .parse (sourceContent);
38+ code = TestCode .parseNormalized (sourceContent);
3939 if (lineFoldingOnly) {
4040 setLineFoldingOnly ();
4141 }
@@ -164,15 +164,23 @@ class AnnotatedDartClass/*[1*/ {
164164}/*1]*/
165165''' ;
166166
167- var pluginResult = plugin.AnalysisFoldingParams (pluginAnalyzedFilePath, [
168- plugin.FoldingRegion (plugin.FoldingKind .DIRECTIVES , 3 , 26 ),
169- ]);
167+ initializePlugin () {
168+ // Plugin only produces first range of two.
169+ var range = code.ranges[0 ].sourceRange;
170+ var pluginResult = plugin.AnalysisFoldingParams (pluginAnalyzedFilePath, [
171+ plugin.FoldingRegion (
172+ plugin.FoldingKind .DIRECTIVES ,
173+ range.offset,
174+ range.length,
175+ ),
176+ ]);
177+ configureTestPlugin (notification: pluginResult.toNotification ());
178+ }
170179
171180 await computeRanges (
172181 content,
173182 uri: pluginAnalyzedUri,
174- initializePlugin: () =>
175- configureTestPlugin (notification: pluginResult.toNotification ()),
183+ initializePlugin: initializePlugin,
176184 );
177185 expectRanges ({
178186 0 : FoldingRangeKind .Imports , // From plugin
@@ -190,15 +198,22 @@ CREATE TABLE foo(
190198);
191199''' ;
192200
193- var pluginResult = plugin.AnalysisFoldingParams (pluginAnalyzedFilePath, [
194- plugin.FoldingRegion (plugin.FoldingKind .CLASS_BODY , 22 , 15 ),
195- ]);
201+ initializePlugin () {
202+ var range = code.range.sourceRange;
203+ var pluginResult = plugin.AnalysisFoldingParams (pluginAnalyzedFilePath, [
204+ plugin.FoldingRegion (
205+ plugin.FoldingKind .CLASS_BODY ,
206+ range.offset,
207+ range.length,
208+ ),
209+ ]);
210+ configureTestPlugin (notification: pluginResult.toNotification ());
211+ }
196212
197213 await computeRanges (
198214 content,
199215 uri: pluginAnalyzedUri,
200- initializePlugin: () =>
201- configureTestPlugin (notification: pluginResult.toNotification ()),
216+ initializePlugin: initializePlugin,
202217 );
203218 expectRanges ({
204219 0 : noFoldingKind, // From plugin
0 commit comments