Skip to content

Commit 77503bd

Browse files
authored
Added support for vscode and vscode-insiders installed via Flatpak (#137123)
Closes #137122 <b>Before</b> VS Code and VS Code Insiders installed via Flatpak aren't detected <b>After</b> ```sh [�] VS Code (version 1.82.2) � VS Code at /var/lib/flatpak/app/com.visualstudio.code/x86_64/stable/active/files/extra/vscode � Flutter extension version 3.74.0 [�] VS Code (version 1.84.0-insider) � VS Code at /var/lib/flatpak/app/com.visualstudio.code.insiders/x86_64/beta/active/files/extra/vscode-insiders � Flutter extension version 3.75.20231002 ```
1 parent 909e529 commit 77503bd

2 files changed

Lines changed: 44 additions & 6 deletions

File tree

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

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -237,17 +237,30 @@ class VsCode {
237237
}
238238

239239
// Linux:
240-
// /usr/share/code/bin/code
241-
// /snap/code/current/usr/share/code
242-
// /usr/share/code-insiders/bin/code-insiders
243-
// /snap/code-insiders/current/usr/share/code-insiders
240+
// Deb:
241+
// /usr/share/code/bin/code
242+
// /usr/share/code-insiders/bin/code-insiders
243+
// Snap:
244+
// /snap/code/current/usr/share/code
245+
// Flatpak:
246+
// /var/lib/flatpak/app/com.visualstudio.code/x86_64/stable/active/files/extra/vscode
247+
// /var/lib/flatpak/app/com.visualstudio.code.insiders/x86_64/beta/active/files/extra/vscode-insiders
244248
// Linux Extensions:
245-
// $HOME/.vscode/extensions
246-
// $HOME/.vscode-insiders/extensions
249+
// Deb:
250+
// $HOME/.vscode/extensions
251+
// Snap:
252+
// $HOME/.vscode/extensions
253+
// Flatpak:
254+
// $HOME/.var/app/com.visualstudio.code/data/vscode/extensions
255+
// $HOME/.var/app/com.visualstudio.code.insiders/data/vscode-insiders/extensions
247256
static List<VsCode> _installedLinux(FileSystem fileSystem, Platform platform) {
248257
return _findInstalled(<VsCodeInstallLocation>[
249258
const VsCodeInstallLocation('/usr/share/code', '.vscode'),
250259
const VsCodeInstallLocation('/snap/code/current/usr/share/code', '.vscode'),
260+
const VsCodeInstallLocation(
261+
'/var/lib/flatpak/app/com.visualstudio.code/x86_64/stable/active/files/extra/vscode',
262+
'.var/app/com.visualstudio.code/data/vscode',
263+
),
251264
const VsCodeInstallLocation(
252265
'/usr/share/code-insiders',
253266
'.vscode-insiders',
@@ -256,6 +269,10 @@ class VsCode {
256269
'/snap/code-insiders/current/usr/share/code-insiders',
257270
'.vscode-insiders',
258271
),
272+
const VsCodeInstallLocation(
273+
'/var/lib/flatpak/app/com.visualstudio.code.insiders/x86_64/beta/active/files/extra/vscode-insiders',
274+
'.var/app/com.visualstudio.code.insiders/data/vscode-insiders',
275+
),
259276
], fileSystem, platform);
260277
}
261278

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,27 @@ void main() {
5454
expect(installed.length, 2);
5555
});
5656

57+
testWithoutContext('can locate VS Code installed via Flatpak', () {
58+
final FileSystem fileSystem = MemoryFileSystem.test();
59+
const String home = '/home/me';
60+
final Platform platform = FakePlatform(environment: <String, String>{'HOME': home});
61+
62+
fileSystem.directory(fileSystem.path.join(
63+
'/var/lib/flatpak/app/com.visualstudio.code/x86_64/stable/active/files/extra/vscode',
64+
'.var/app/com.visualstudio.code/data/vscode',
65+
)).createSync(recursive: true);
66+
67+
fileSystem.directory(fileSystem.path.join(
68+
'/var/lib/flatpak/app/com.visualstudio.code.insiders/x86_64/beta/active/files/extra/vscode-insiders',
69+
'.var/app/com.visualstudio.code.insiders/data/vscode-insiders',
70+
)).createSync(recursive: true);
71+
72+
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[]);
73+
74+
final List<VsCode> installed = VsCode.allInstalled(fileSystem, platform, processManager);
75+
expect(installed.length, 2);
76+
});
77+
5778
testWithoutContext('can locate installations on macOS', () {
5879
final FileSystem fileSystem = MemoryFileSystem.test();
5980
const String home = '/home/me';

0 commit comments

Comments
 (0)