Skip to content

Commit 7575e2c

Browse files
zandersoCommit Queue
authored and
Commit Queue
committed
Revert "[analysis_server] Use fixDataYamlFolder constant instead of string literals"
This reverts commit ccb02fa. Reason for revert: Blocking revert in https://dart-review.googlesource.com/c/sdk/+/297320 Original change's description: > [analysis_server] Use fixDataYamlFolder constant instead of string literals > > Follow-up from https://dart-review.googlesource.com/c/sdk/+/296801. > > Change-Id: I72ea8a42ec64c4bd6c6cee021a1464167ec368e6 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/296862 > Reviewed-by: Brian Wilkerson <[email protected]> > Commit-Queue: Brian Wilkerson <[email protected]> Change-Id: I8ed39fc343b9121c40de83038e97c43cac669ca1 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/297321 Bot-Commit: Rubber Stamper <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Zach Anderson <[email protected]>
1 parent 45efccb commit 7575e2c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

pkg/analysis_server/lib/src/context_manager.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ class ContextManagerImpl implements ContextManager {
458458
// packageName/lib/fix_data.yaml
459459
packageName = pathSegments[pathSegments.length - 3];
460460
} else {
461-
var fixDataIndex = pathSegments.indexOf(file_paths.fixDataYamlFolder);
461+
var fixDataIndex = pathSegments.indexOf('fix_data');
462462
if (fixDataIndex >= 2) {
463463
// packageName/lib/fix_data/foo/bar/fix.yaml
464464
packageName = pathSegments[fixDataIndex - 2];
@@ -574,7 +574,7 @@ class ContextManagerImpl implements ContextManager {
574574

575575
var fixDataFolder = rootFolder
576576
.getChildAssumingFolder('lib')
577-
.getChildAssumingFolder(file_paths.fixDataYamlFolder);
577+
.getChildAssumingFolder('fix_data');
578578
if (fixDataFolder.exists) {
579579
_analyzeFixDataFolder(driver, fixDataFolder, packageName);
580580
}

pkg/analyzer/lib/src/util/file_paths.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ bool isDart(p.Context pathContext, String path) {
7272
/// Such files specify data-driven fixes.
7373
bool isFixDataYaml(p.Context pathContext, String path) {
7474
return pathContext.basename(path) == fixDataYaml ||
75-
(pathContext.split(path).contains(fixDataYamlFolder) &&
75+
(pathContext.split(path).contains('fix_data') &&
7676
pathContext.extension(path) == '.yaml');
7777
}
7878

0 commit comments

Comments
 (0)