Skip to content

Update env for calling tools #8966

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.

Sign up for GitHub

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
helin24 merged 4 commits into from
May 9, 2026
Merged

Update env for calling tools #8966

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e15d126
Update env for calling tools
helin24 May 8, 2026
052c3ab
Add update to other flutter commands
helin24 May 8, 2026
ff60fbc
Remove line
helin24 May 8, 2026
d146ebc
Remove redundant env setting
helin24 May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/io/flutter/run/SdkFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.intellij.util.xmlb.annotations.XMap;
import com.jetbrains.lang.dart.sdk.DartConfigurable;
import com.jetbrains.lang.dart.sdk.DartSdk;
import com.jetbrains.lang.dart.analytics.Analytics;
import io.flutter.FlutterBundle;
import io.flutter.FlutterUtils;
import io.flutter.dart.DartPlugin;
Expand Down Expand Up @@ -240,6 +241,7 @@ public GeneralCommandLine createFlutterSdkRunCommand(
command = flutterSdk.flutterRun(root, main.getFile(), device, runMode, flutterLaunchMode, project, args);
final GeneralCommandLine commandLine = command.createGeneralCommandLine(project);
commandLine.getEnvironment().putAll(getEnvs());
Analytics.updateEnvironment(commandLine);
commandLine.withParentEnvironmentType(GeneralCommandLine.ParentEnvironmentType.CONSOLE);
Comment thread
helin24 marked this conversation as resolved.
Outdated
return commandLine;
}
Expand Down
3 changes: 3 additions & 0 deletions src/io/flutter/run/bazel/BazelFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.intellij.openapi.vfs.VirtualFile;
import com.jetbrains.lang.dart.sdk.DartConfigurable;
import com.jetbrains.lang.dart.sdk.DartSdk;
import com.jetbrains.lang.dart.analytics.Analytics;
import io.flutter.FlutterBundle;
import io.flutter.FlutterMessages;
import io.flutter.bazel.Workspace;
Expand Down Expand Up @@ -344,6 +345,8 @@ else if (FlutterSettings.getInstance().isEnableBazelHotRestart() && !hasEnabledA

commandLine.addParameter(target);

Analytics.updateEnvironment(commandLine);

return commandLine;
}

Expand Down
3 changes: 3 additions & 0 deletions src/io/flutter/run/daemon/DevToolsServerTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import com.intellij.openapi.util.registry.Registry;
import com.jetbrains.lang.dart.ide.devtools.DartDevToolsService;
import com.jetbrains.lang.dart.ide.toolingDaemon.DartToolingDaemonService;
import com.jetbrains.lang.dart.analytics.Analytics;
import io.flutter.FlutterMessages;
import io.flutter.FlutterUtils;
import io.flutter.bazel.WorkspaceCache;
Expand Down Expand Up @@ -260,6 +261,8 @@ private void tryParseStartupText(@NotNull String text) {
result.addParameter(argument);
}

Analytics.updateEnvironment(result);

return result;
}

Expand Down
4 changes: 4 additions & 0 deletions src/io/flutter/sdk/FlutterCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import io.flutter.android.IntelliJAndroidSdk;
import io.flutter.console.FlutterConsoles;
import io.flutter.dart.DartPlugin;
import com.jetbrains.lang.dart.analytics.Analytics;
import io.flutter.logging.PluginLogger;
import io.flutter.settings.FlutterSettings;
import io.flutter.utils.MostlySilentColoredProcessHandler;
Expand Down Expand Up @@ -315,6 +316,9 @@ public GeneralCommandLine createGeneralCommandLine(@Nullable Project project) {
}
line.addParameters(type.subCommand);
line.addParameters(args);

Analytics.updateEnvironment(line);

return line;
}

Expand Down
Loading