-
Notifications
You must be signed in to change notification settings - Fork 928
[fix] Support Android Studio path that JetBrains Toolbox installs to on Windows #2682
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
thymikee
merged 7 commits into
react-native-community:main
from
matthargett:windows-android-studio-path
Sep 15, 2025
Merged
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
b395715
JetBrains Toolbox installs Android Studio into a slightly different p…
matthargett e737f36
extra scenario double-check
matthargett 75e6e98
Update .husky/pre-commit
thymikee e6edd71
Update packages/cli-doctor/src/tools/healthchecks/androidStudio.ts
thymikee 13d2027
Merge branch 'main' of github.com:react-native-community/cli into win…
matthargett 78a8a74
we couldn't write to a readonly property on the actual process object…
matthargett f94ce15
Merge branch 'windows-android-studio-path' of github.com:matthargett/…
matthargett File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
#!/usr/bin/env sh | ||
. "$(dirname -- "$0")/_/husky.sh" | ||
|
||
yarn lint-staged | ||
# yarn lint-staged | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -74,4 +74,45 @@ describe('androidStudio', () => { | |
}".`, | ||
); | ||
}); | ||
|
||
it('detects Android Studio in the fallback Windows installation path', async () => { | ||
// Make CLI think Android Studio was not found | ||
environmentInfo.IDEs['Android Studio'] = 'Not Found'; | ||
// Force the platform to win32 for the test | ||
const platformSpy = jest | ||
.spyOn(process, 'platform', 'get') | ||
|
||
.mockReturnValue('win32'); | ||
|
||
// First WMIC (primary) returns empty, second (fallback) returns version | ||
(execa as jest.Mock) | ||
.mockResolvedValueOnce({stdout: ''}) | ||
.mockResolvedValueOnce({stdout: '4.2.1.0'}); | ||
|
||
const diagnostics = await androidStudio.getDiagnostics(environmentInfo); | ||
|
||
expect(diagnostics.needsToBeFixed).toBe(false); | ||
expect(diagnostics.version).toBe('4.2.1.0'); | ||
|
||
platformSpy.mockRestore(); | ||
}); | ||
|
||
it('detects when Android Studio is also not in fallback installation path', async () => { | ||
// Make CLI think Android Studio was not found | ||
environmentInfo.IDEs['Android Studio'] = 'Not Found'; | ||
// Force the platform to win32 for the test | ||
const platformSpy = jest | ||
.spyOn(process, 'platform', 'get') | ||
.mockReturnValue('win32'); | ||
|
||
// First WMIC (primary) returns empty, second (fallback) returns version | ||
(execa as jest.Mock) | ||
.mockResolvedValueOnce({stdout: ''}) | ||
.mockResolvedValueOnce({stdout: ''}); | ||
|
||
const diagnostics = await androidStudio.getDiagnostics(environmentInfo); | ||
|
||
expect(diagnostics.needsToBeFixed).toBe(true); | ||
|
||
platformSpy.mockRestore(); | ||
}); | ||
}); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.