Skip to content

Commit b10bf20

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents eec1adf + 2e57113 commit b10bf20

2 files changed

Lines changed: 15 additions & 13 deletions

File tree

‎python-impl/src/main/java/com/jetbrains/python/impl/run/PyPluginCommonOptionsForm.java‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public PyPluginCommonOptionsForm(PyCommonOptionsFormData data, Disposable uiDisp
8383
myModules = FlatDataModel.of(validModules);
8484

8585
myModuleComboBox = ComboBox.create(myModules);
86-
myModuleComboBox.setRender((presentation, item) -> {
86+
myModuleComboBox.setRenderer((presentation, item) -> {
8787
Module module = item.getValue();
8888
if (module != null) {
8989
presentation.withIcon(PlatformIconGroup.nodesModule());
@@ -201,35 +201,37 @@ public void subscribe() {
201201
}
202202

203203
@Override
204+
@RequiredUIAccess
204205
public Disposable addInterpreterListener(Runnable listener) {
205206
return myInterpreterComboBox.getComponent().addValueListener(event -> listener.run());
206207
}
207208

208-
@RequiredUIAccess
209209
@Override
210+
@RequiredUIAccess
210211
public String getInterpreterOptions() {
211212
return StringUtil.notNullize(myInterpreterOptionsTextField.getValue()).trim();
212213
}
213214

214-
@RequiredUIAccess
215215
@Override
216+
@RequiredUIAccess
216217
public void setInterpreterOptions(@Nullable String interpreterOptions) {
217218
myInterpreterOptionsTextField.setValue(StringUtil.notNullize(interpreterOptions));
218219
}
219220

220-
@RequiredUIAccess
221221
@Override
222+
@RequiredUIAccess
222223
public String getWorkingDirectory() {
223224
return FileUtil.toSystemIndependentName(myWorkingDirectoryTextField.getValue().trim());
224225
}
225226

226-
@RequiredUIAccess
227227
@Override
228+
@RequiredUIAccess
228229
public void setWorkingDirectory(@Nullable String workingDirectory) {
229230
myWorkingDirectoryTextField.setValue(workingDirectory == null ? "" : FileUtil.toSystemDependentName(workingDirectory));
230231
}
231232

232233
@Override
234+
@RequiredUIAccess
233235
public @Nullable String getSdkHome() {
234236
BundleBox.BundleBoxItem item = myInterpreterComboBox.getComponent().getValue();
235237
if (item == null) {
@@ -239,8 +241,8 @@ public void setWorkingDirectory(@Nullable String workingDirectory) {
239241
return sdk != null ? sdk.getHomePath() : item.getBundleName();
240242
}
241243

242-
@RequiredUIAccess
243244
@Override
245+
@RequiredUIAccess
244246
public void setSdkHome(@Nullable String sdkHome) {
245247
if (StringUtil.isEmptyOrSpaces(sdkHome)) {
246248
myInterpreterComboBox.setSelectedNoneBundle();
@@ -269,8 +271,8 @@ public void setSdkHome(@Nullable String sdkHome) {
269271
return module != null ? module.getName() : null;
270272
}
271273

272-
@RequiredUIAccess
273274
@Override
275+
@RequiredUIAccess
274276
public void setModule(@Nullable Module module) {
275277
if (module != null && myModules.indexOf(module) < 0) {
276278
myModules.add(module);
@@ -283,8 +285,8 @@ public boolean isUseModuleSdk() {
283285
return Boolean.TRUE.equals(myUseModuleSdkGroup.getValue());
284286
}
285287

286-
@RequiredUIAccess
287288
@Override
289+
@RequiredUIAccess
288290
public void setUseModuleSdk(boolean useModuleSdk) {
289291
myUseModuleSdkGroup.setValue(useModuleSdk, false);
290292
updateControls();
@@ -295,8 +297,8 @@ public boolean isPassParentEnvs() {
295297
return myEnvsComponent.isPassParentEnvs();
296298
}
297299

298-
@RequiredUIAccess
299300
@Override
301+
@RequiredUIAccess
300302
public void setPassParentEnvs(boolean passParentEnvs) {
301303
myEnvsComponent.setPassParentEnvs(passParentEnvs);
302304
}
@@ -339,14 +341,14 @@ public boolean shouldAddSourceRoots() {
339341
return myAddSourceRootsCheckbox.getValueOrError();
340342
}
341343

342-
@RequiredUIAccess
343344
@Override
345+
@RequiredUIAccess
344346
public void setAddContentRoots(boolean flag) {
345347
myAddContentRootsCheckbox.setValue(flag);
346348
}
347349

348-
@RequiredUIAccess
349350
@Override
351+
@RequiredUIAccess
350352
public void setAddSourceRoots(boolean flag) {
351353
myAddSourceRootsCheckbox.setValue(flag);
352354
}

‎verbaria-lock.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"project" : "consulo-python",
44
"projectVersion" : "master",
55
"sourceLocale" : "en-US",
6-
"generatedAt" : "2026-09-30T21:40:38.130810668Z",
6+
"generatedAt" : "2026-10-12T16:43:43.799218723Z",
77
"documents" : {
88
"consulo.python.impl.PyLocalize" : {
99
"source" : {
10-
"sig" : "9eabb23244a7bc7f55c9b0456a07eaab"
10+
"sig" : "dbbafab41ca562924075323566d48eb3"
1111
}
1212
}
1313
}

0 commit comments

Comments
 (0)