Skip to content

Fix split debugging error in 2026.1 #8877

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

Closed
helin24 wants to merge 4 commits into from
Closed

Fix split debugging error in 2026.1 #8877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f63cdb5
Use different debug session API
helin24 Mar 27, 2026
2caeeb1
WIP Try to change version to build
helin24 Mar 28, 2026
33b7089
Build to 2026.1
helin24 Mar 31, 2026
97588fb
Add comments
helin24 Mar 31, 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: 1 addition & 1 deletion .idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 24 additions & 6 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ plugins {
// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm
id("java") // Java support
id("org.jetbrains.intellij.platform") version "2.12.0" // IntelliJ Platform Gradle Plugin
id("org.jetbrains.kotlin.jvm") version "2.2.0" // Kotlin support
id("org.jetbrains.kotlin.jvm") version "2.3.20" // Kotlin support
id("org.jetbrains.changelog") version "2.2.0" // Gradle Changelog Plugin
id("org.jetbrains.kotlinx.kover") version "0.9.4"
idea // IntelliJ IDEA support
Expand Down Expand Up @@ -103,7 +103,7 @@ jvmVersion = when (javaVersion) {

kotlin {
compilerOptions {
apiVersion.set(KotlinVersion.KOTLIN_2_1)
apiVersion.set(KotlinVersion.KOTLIN_2_3)
jvmTarget = jvmVersion
}
// This is how you specify the specific JVM requirements, this may be a requirement for the Starter test framework
Expand Down Expand Up @@ -155,6 +155,23 @@ sourceSets {
"resources"
)
)

// TODO(helin24): Include these files when we go back to building against Android Studio.
java.exclude("**/AndroidStudioGradleSyncProvider.java")
java.exclude("**/GradleUtils.java")
java.exclude("**/FlutterExternalSystemTaskNotificationListener.java")
java.exclude("**/AndroidLocationProvider.java")
java.exclude("**/FlutterStudioStartupActivity.java")
java.exclude("**/OpenAndroidModule.java")
java.exclude("**/AddToAppUtils.java")

kotlin.exclude("**/AndroidStudioGradleSyncProvider.java")
kotlin.exclude("**/GradleUtils.java")
kotlin.exclude("**/FlutterExternalSystemTaskNotificationListener.java")
kotlin.exclude("**/AndroidLocationProvider.java")
kotlin.exclude("**/FlutterStudioStartupActivity.java")
kotlin.exclude("**/OpenAndroidModule.java")
kotlin.exclude("**/AddToAppUtils.java")
Comment on lines +160 to +174
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

[CONCERN] The list of excluded files is duplicated for both Java and Kotlin source sets. This violates the DRY (Don't Repeat Yourself) principle and increases the maintenance burden. Consider defining the list once and applying it to both source sets.

    val androidStudioExcludes = listOf(
      "**/AndroidStudioGradleSyncProvider.java",
      "**/GradleUtils.java",
      "**/FlutterExternalSystemTaskNotificationListener.java",
      "**/AndroidLocationProvider.java",
      "**/FlutterStudioStartupActivity.java",
      "**/OpenAndroidModule.java",
      "**/AddToAppUtils.java"
    )
    java.exclude(androidStudioExcludes)
    kotlin.exclude(androidStudioExcludes)

}
test {
java.srcDirs(
Expand Down Expand Up @@ -202,7 +219,8 @@ dependencies {
// https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#default-target-platforms
// Android Studio versions can be found at: https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html
try {
androidStudio(ideaVersion)
// TODO(helin24): Go back to using Android Studio once 2026.1 is released.
intellijIdeaUltimate(ideaVersion)
} catch (e: Exception) {
throw GradleException(
"Failed to resolve Android Studio / IDEA download URL. This is likely due to a network issue blocking the download URL. Please check your internet connection or VPN.",
Expand All @@ -216,21 +234,21 @@ dependencies {
// Plugin dependency documentation:
// https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#plugins
// https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html#project-setup
// TODO(helin24): Add back bundled plugins once we go back to building against Android Studio.
bundledPlugins(
immutableListOf(
"com.intellij.java",
"com.intellij.properties",
"JUnit",
"Git4Idea",
"org.jetbrains.kotlin",
"org.jetbrains.plugins.gradle",
"org.jetbrains.plugins.yaml",
"org.intellij.intelliLang",
"org.jetbrains.android",
"com.android.tools.idea.smali"
)
)
plugin("Dart:$dartPluginVersion")
plugin("org.jetbrains.android:261.22158.277")
plugin("org.jetbrains.plugins.gradle:261.22158.182")

if (sinceBuildInput == "243" || sinceBuildInput == "251") {
bundledModule("intellij.platform.coverage")
Expand Down
8 changes: 5 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@
# found in the LICENSE file.
#

ideaVersion=2025.2.3.9
ideaVersion=2026.1
dartPluginVersion= 503.0.0
# Also update the versions for verify checks in tool/github.sh.
sinceBuild=251
untilBuild=261.*
sinceBuild=261
untilBuild=262.*
javaVersion=21
kotlin.stdlib.default.dependency=false
org.gradle.parallel=true
org.gradle.jvmargs=-Xms1024m -Xmx4048m

org.gradle.caching=true
org.gradle.configuration-cache=true
# This is needed in 2026.1 for runIde to work.
token=dummy
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

[CONCERN] The addition of token=dummy appears to be a leftover from local development or CI testing. Unless this property is strictly required by the build system, it should be removed to maintain a clean configuration file.

15 changes: 9 additions & 6 deletions src/io/flutter/run/LaunchState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import com.intellij.xdebugger.XDebugProcessStarter;
import com.intellij.xdebugger.XDebugSession;
import com.intellij.xdebugger.XDebuggerManager;
import com.intellij.xdebugger.XSessionStartedResult;
import com.jetbrains.lang.dart.ide.runner.DartExecutionHelper;
import com.jetbrains.lang.dart.util.DartUrlResolver;
import io.flutter.FlutterConstants;
Expand Down Expand Up @@ -224,28 +225,30 @@ protected void showNoDeviceConnectedMessage(Project project) {
}

@NotNull
protected XDebugSession createDebugSession(@NotNull final ExecutionEnvironment env,
@NotNull final FlutterApp app,
@NotNull final ExecutionResult executionResult)
protected XSessionStartedResult createDebugSession(@NotNull final ExecutionEnvironment env,
@NotNull final FlutterApp app,
@NotNull final ExecutionResult executionResult)
throws ExecutionException {

final DartUrlResolver resolver = DartUrlResolver.getInstance(env.getProject(), sourceLocation);
final FlutterPositionMapper mapper = createPositionMapper(env, app, resolver);

final XDebuggerManager manager = XDebuggerManager.getInstance(env.getProject());
final XDebugSession session = manager.startSession(env, new XDebugProcessStarter() {
final XSessionStartedResult startedResult = manager.newSessionBuilder(new XDebugProcessStarter() {
@Override
@NotNull
public XDebugProcess start(@NotNull final XDebugSession session) {
return new FlutterDebugProcess(app, env, session, executionResult, resolver, mapper);
}
});
}).environment(env).startSession();

final XDebugSession session = startedResult.getSession();

if (app.getMode() != RunMode.DEBUG) {
session.setBreakpointMuted(true);
}

return session;
return startedResult;
}

@NotNull
Expand Down
7 changes: 4 additions & 3 deletions src/io/flutter/run/bazelTest/BazelTestRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import com.intellij.xdebugger.XDebugSession;
import com.intellij.xdebugger.XDebuggerManager;
import com.jetbrains.lang.dart.sdk.DartSdkLibUtil;
import com.intellij.xdebugger.XSessionStartedResult;
import com.jetbrains.lang.dart.util.DartUrlResolver;
import io.flutter.FlutterMessages;
import io.flutter.FlutterUtils;
Expand Down Expand Up @@ -100,15 +101,15 @@ protected RunContentDescriptor runInDebugger(@NotNull BazelTestLaunchState launc

// Create the debug session.
final XDebuggerManager manager = XDebuggerManager.getInstance(env.getProject());
final XDebugSession session = manager.startSession(env, new XDebugProcessStarter() {
final XSessionStartedResult result = manager.newSessionBuilder(new XDebugProcessStarter() {
@Override
@NotNull
public XDebugProcess start(@NotNull final XDebugSession session) {
return new BazelTestDebugProcess(env, session, executionResult, resolver, connector, mapper);
}
});
}).environment(env).startSession();

return session.getRunContentDescriptor();
return result.getRunContentDescriptor();
}

/**
Expand Down
7 changes: 4 additions & 3 deletions src/io/flutter/run/test/FlutterTestRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import com.intellij.xdebugger.XDebugSession;
import com.intellij.xdebugger.XDebuggerManager;
import com.jetbrains.lang.dart.util.DartUrlResolver;

import io.flutter.FlutterUtils;
import io.flutter.ObservatoryConnector;
import io.flutter.logging.PluginLogger;
Expand Down Expand Up @@ -210,15 +211,15 @@ protected RunContentDescriptor runInDebugger(@NotNull TestLaunchState launcher,

// Create the debug session.
final XDebuggerManager manager = XDebuggerManager.getInstance(env.getProject());
final XDebugSession session = manager.startSession(env, new XDebugProcessStarter() {
final var result = manager.newSessionBuilder(new XDebugProcessStarter() {
@Override
@NotNull
public XDebugProcess start(@NotNull final XDebugSession session) {
return new TestDebugProcess(env, session, executionResult, resolver, connector, mapper);
}
});
}).environment(env).startSession();

return session.getRunContentDescriptor();
return result.getRunContentDescriptor();
}

/**
Expand Down
Loading