firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't search in %LocalAppData% if it's not set (#23933)

Browse Source 
It's not usual for this not to be set, but it affected at least one user (#23909) and there are a non-zero number of people online saying it's not set. It's better that we don't crash.

Fixes #23909.
This commit is contained in:
Danny Tuppeny 2018-11-05 08:57:49 +00:00 committed by GitHub
parent db9fe3f827
commit 8e7c8048de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
packages/flutter_tools/lib/src/vscode/vscode.dart
View File

@ -132,19 +132,38 @@ class VsCode {
final String progFiles = platform.environment['programfiles']; final String progFiles = platform.environment['programfiles'];
final String localAppData = platform.environment['localappdata']; final String localAppData = platform.environment['localappdata'];
return _findInstalled(<_VsCodeInstallLocation>[ final List<_VsCodeInstallLocation> searchLocations =
_VsCodeInstallLocation(fs.path.join(localAppData, 'Programs\\Microsoft VS Code'), '.vscode'), <_VsCodeInstallLocation>[];
_VsCodeInstallLocation(fs.path.join(progFiles86, 'Microsoft VS Code'), '.vscode',
edition: '32-bit edition'), if (localAppData != null) {
_VsCodeInstallLocation(fs.path.join(progFiles, 'Microsoft VS Code'), '.vscode', searchLocations.add(_VsCodeInstallLocation(
edition: '64-bit edition'), fs.path.join(localAppData, 'Programs\\Microsoft VS Code'),
_VsCodeInstallLocation(fs.path.join(localAppData, 'Programs\\Microsoft VS Code Insiders'), '.vscode-insiders', '.vscode'));
isInsiders: true), }
_VsCodeInstallLocation(fs.path.join(progFiles86 , 'Microsoft VS Code Insiders'), '.vscode-insiders', searchLocations.add(_VsCodeInstallLocation(
edition: '32-bit edition', isInsiders: true), fs.path.join(progFiles86, 'Microsoft VS Code'), '.vscode',
_VsCodeInstallLocation(fs.path.join(progFiles, 'Microsoft VS Code Insiders'), '.vscode-insiders', edition: '32-bit edition'));
edition: '64-bit edition', isInsiders: true), searchLocations.add(_VsCodeInstallLocation(
]); fs.path.join(progFiles, 'Microsoft VS Code'), '.vscode',
edition: '64-bit edition'));
if (localAppData != null) {
searchLocations.add(_VsCodeInstallLocation(
fs.path.join(localAppData, 'Programs\\Microsoft VS Code Insiders'),
'.vscode-insiders',
isInsiders: true));
}
searchLocations.add(_VsCodeInstallLocation(
fs.path.join(progFiles86, 'Microsoft VS Code Insiders'),
'.vscode-insiders',
edition: '32-bit edition',
isInsiders: true));
searchLocations.add(_VsCodeInstallLocation(
fs.path.join(progFiles, 'Microsoft VS Code Insiders'),
'.vscode-insiders',
edition: '64-bit edition',
isInsiders: true));
return _findInstalled(searchLocations);
} }
// Linux: // Linux: