DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ Tool ] Fix failed VSCode version lookup on Linux (#169949)

Browse Source 
VSCode installations on Linux appear to place the packages.json file at
`$VSCODE_INSTALL/resources/app/package.json` rather than at the expected
`$VSCODE_INSTALL/Resources/app/package.json`, causing the VSCode version
to not be reported correctly on Linux.

Fixes https://github.com/flutter/flutter/issues/169812
This commit is contained in:
Ben Konyi 2025-06-04 16:17:27 -04:00 committed by GitHub
parent d3e8dc3df9
commit 94e9a2ca8d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,10 +68,11 @@ class VsCode {
String extensionDirectory, {
String? edition,
required FileSystem fileSystem,
required Platform platform,
}) {
final String packageJsonPath = fileSystem.path.join(
installPath,
'Resources',
platform.isLinux ? 'resources' : 'Resources',
'app',
'package.json',
);
@ -311,6 +312,7 @@ class VsCode {
extensionDirectory,
edition: searchLocation.edition,
fileSystem: fileSystem,
platform: platform,
),
);
}

1
packages/flutter_tools/test/commands.shard/hermetic/doctor_test.dart
View File

@ -1428,6 +1428,7 @@ class VsCodeValidatorTestTargets extends VsCodeValidator {
extensionDirectory,
edition: edition,
fileSystem: globals.fs,
platform: globals.platform,
),
);

4
packages/flutter_tools/test/data/vscode/application/resources/app/package.json Normal file
View File

@ -0,0 +1,4 @@
{
"name": "fake-vs-code-install-for-tests",
"version": "1.2.3"
}

27
packages/flutter_tools/test/general.shard/vscode/vscode_test.dart
View File

@ -5,6 +5,7 @@
import 'package:file/memory.dart';
import 'package:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/base/platform.dart';
import 'package:flutter_tools/src/base/version.dart';
import 'package:flutter_tools/src/vscode/vscode.dart';
import '../../src/common.dart';
@ -55,11 +56,35 @@ void main() {
..createSync(recursive: true)
..writeAsStringSync('{');
final VsCode vsCode = VsCode.fromDirectory('', '', fileSystem: fileSystem);
final VsCode vsCode = VsCode.fromDirectory(
'',
'',
fileSystem: fileSystem,
platform: const LocalPlatform(),
);
expect(vsCode.version, null);
});
testWithoutContext('VsCode.fromDirectory finds packages.json on Linux', () {
// Regression test for https://github.com/flutter/flutter/issues/169812
final MemoryFileSystem fileSystem = MemoryFileSystem.test();
// Installations on Linux appear to use $VSCODE_INSTALL/resources/app/package.json rather than
// $VSCODE_INSTALL/Resources/app/package.json.
fileSystem.file(fileSystem.path.join('', 'resources', 'app', 'package.json'))
..createSync(recursive: true)
..writeAsStringSync('{"version":"1.2.3"}');
final VsCode vsCode = VsCode.fromDirectory(
'',
'',
fileSystem: fileSystem,
platform: FakePlatform(),
);
expect(vsCode.version, Version(1, 2, 3));
});
testWithoutContext('can locate VS Code installed via Snap', () {
final FileSystem fileSystem = MemoryFileSystem.test();
const String home = '/home/me';