Skip to content

Commit ffcc383

Browse files
authored
[flutter_tools] Fix VS Code package.json path on macOS with case-sensitive file system (#163409)
This PR corrects the path to VS Code's `package.json` in `flutter doctor` for macOS with a case-sensitive file system. The correct directory name is `Resources`, but the existing code incorrectly uses `resources`. On a case-insensitive file system (the macOS default), this issue does not appear. However, on a case-sensitive file system, `flutter doctor` fails to detect the VS Code version correctly. Fixes #163408. <!-- Thanks for filing a pull request! Reviewers are typically assigned within a week of filing a request. To learn more about code review, see our documentation on Tree Hygiene: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md --> *Replace this paragraph with a description of what this PR is changing or adding, and why. Consider including before/after screenshots.* *List which issues are fixed by this PR. You must list at least one issue. An issue is not required if the PR fixes something trivial like a typo.* *If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].* ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [ ] I updated/added relevant documentation (doc comments with `///`). - [ ] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
1 parent 228a011 commit ffcc383

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

packages/flutter_tools/lib/src/vscode/vscode.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class VsCode {
7171
}) {
7272
final String packageJsonPath = fileSystem.path.join(
7373
installPath,
74-
'resources',
74+
'Resources',
7575
'app',
7676
'package.json',
7777
);

packages/flutter_tools/test/general.shard/vscode/vscode_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void main() {
5151
testWithoutContext('VsCode.fromDirectory does not crash when packages.json is malformed', () {
5252
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
5353
// Create invalid JSON file.
54-
fileSystem.file(fileSystem.path.join('', 'resources', 'app', 'package.json'))
54+
fileSystem.file(fileSystem.path.join('', 'Resources', 'app', 'package.json'))
5555
..createSync(recursive: true)
5656
..writeAsStringSync('{');
5757

0 commit comments

Comments
 (0)