@@ -19,6 +19,7 @@ import com.intellij.psi.SmartPointerManager
19
19
import com.jetbrains.rdclient.util.idea.LifetimedProjectComponent
20
20
import com.jetbrains.rider.model.lambdaDaemonModel
21
21
import com.jetbrains.rider.projectView.solution
22
+ import software.amazon.awssdk.services.lambda.model.Runtime
22
23
import software.aws.toolkits.jetbrains.services.lambda.dotnet.DotNetLambdaHandlerResolver
23
24
import software.aws.toolkits.jetbrains.services.lambda.dotnet.element.RiderLambdaHandlerFakePsiElement
24
25
import software.aws.toolkits.jetbrains.services.lambda.execution.LambdaRunConfigurationType
@@ -95,8 +96,12 @@ class LambdaDaemonHost(project: Project) : LifetimedProjectComponent(project) {
95
96
val configurationType = ConfigurationTypeUtil .findConfigurationType(LambdaRunConfigurationType ::class .java)
96
97
val runConfigurations = runManager.getConfigurationsList(configurationType)
97
98
99
+ val isDebug = executor is DefaultDebugExecutor
100
+
98
101
var settings = runConfigurations.filterIsInstance<LocalLambdaRunConfiguration >().firstOrNull { configuration ->
99
- configuration.handler() == handler
102
+ configuration.handler() == handler &&
103
+ // TODO: Get rid of the check when SAM CLI provide support for dotnet 3.1 lambda debug
104
+ (if (isDebug) configuration.runtime() != Runtime .DOTNETCORE3_1 else true )
100
105
}?.let { configuration ->
101
106
runManager.findSettings(configuration)
102
107
}
@@ -107,7 +112,12 @@ class LambdaDaemonHost(project: Project) : LifetimedProjectComponent(project) {
107
112
val template = runManager.getConfigurationTemplate(factory)
108
113
109
114
val configuration = template.configuration as LocalLambdaRunConfiguration
110
- val runtime = DotNetRuntimeUtils .getCurrentDotNetCoreRuntime()
115
+ val activeRuntime = DotNetRuntimeUtils .getCurrentDotNetCoreRuntime()
116
+
117
+ // TODO: Get rid of the check when SAM CLI provide support for dotnet 3.1 lambda debug
118
+ val runtime =
119
+ if (isDebug && activeRuntime == Runtime .DOTNETCORE3_1 ) DotNetRuntimeUtils .defaultDotNetCoreRuntime
120
+ else activeRuntime
111
121
112
122
LocalLambdaRunConfigurationProducer .setAccountOptions(configuration)
113
123
configuration.useHandler(runtime, handler)
0 commit comments