Skip to content

Replacing consulo.ide.impl.idea.openapi.editor.ex.util.EditorUtil with AWTEditorUtil #308

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
VISTALL merged 1 commit into from
Sep 19, 2026
Merged

Replacing consulo.ide.impl.idea.openapi.editor.ex.util.EditorUtil with AWTEditorUtil #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 11 additions & 13 deletions ...-execution-api/src/main/java/consulo/java/execution/configurations/OwnJavaParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package consulo.java.execution.configurations;

import com.intellij.java.language.projectRoots.roots.NativeLibraryOrderRootType;
Expand Down Expand Up @@ -52,12 +51,12 @@ public class OwnJavaParameters extends OwnSimpleJavaParameters {
public static final Key<OwnJavaParameters> JAVA_PARAMETERS = Key.create("javaParameters");

public String getJdkPath() throws CantRunException {
final Sdk jdk = getJdk();
Sdk jdk = getJdk();
if (jdk == null) {
throw new CantRunException(ExecutionLocalize.noJdkSpecifiedErrorMessage().get());
}

final VirtualFile jdkHome = jdk.getHomeDirectory();
VirtualFile jdkHome = jdk.getHomeDirectory();
if (jdkHome == null) {
throw new CantRunException(ExecutionLocalize.homeDirectoryNotSpecifiedForJdkErrorMessage().get());
}
Expand All @@ -74,7 +73,7 @@ public String getJdkPath() throws CantRunException {
public static final int JDK_AND_CLASSES_AND_PROVIDED = JDK_ONLY | CLASSES_ONLY | INCLUDE_PROVIDED;

public void configureByModule(
final Module module,
Module module,
@MagicConstant(valuesFromClass = OwnJavaParameters.class) int classPathType,
@Nullable Sdk jdk
) throws CantRunException {
Expand Down Expand Up @@ -110,29 +109,29 @@ private void configureJavaLibraryPath(OrderEnumerator enumerator) {
}
}

public void setDefaultCharset(final Project project) {
public void setDefaultCharset(Project project) {
Charset encoding = EncodingProjectManager.getInstance(project).getDefaultCharset();
setCharset(encoding);
}

public void configureByModule(final Module module, @MagicConstant(valuesFromClass = OwnJavaParameters.class) final int classPathType)
public void configureByModule(Module module, @MagicConstant(valuesFromClass = OwnJavaParameters.class) int classPathType)
throws CantRunException {
configureByModule(module, classPathType, getValidJdkToRunModule(module, (classPathType & TESTS_ONLY) == 0));
}

/**
* @deprecated use {@link #getValidJdkToRunModule(Module, boolean)} instead
*/
public static Sdk getModuleJdk(final Module module) throws CantRunException {
public static Sdk getModuleJdk(Module module) throws CantRunException {
return getValidJdkToRunModule(module, false);
}

public static Sdk getValidJdkToRunModule(final Module module, boolean productionOnly) throws CantRunException {
public static Sdk getValidJdkToRunModule(Module module, boolean productionOnly) throws CantRunException {
Sdk jdk = getJdkToRunModule(module, productionOnly);
if (jdk == null) {
throw CantRunException.noJdkForModule(module);
}
final VirtualFile homeDirectory = jdk.getHomeDirectory();
VirtualFile homeDirectory = jdk.getHomeDirectory();
if (homeDirectory == null || !homeDirectory.isValid()) {
throw CantRunException.jdkMisconfigured(jdk, module);
}
Expand All @@ -141,18 +140,17 @@ public static Sdk getValidJdkToRunModule(final Module module, boolean production

@Nullable
public static Sdk getJdkToRunModule(Module module, boolean productionOnly) {
final Sdk moduleSdk = ModuleUtilCore.getSdk(module, JavaModuleExtension.class);
Sdk moduleSdk = ModuleUtilCore.getSdk(module, JavaModuleExtension.class);
if (moduleSdk == null) {
return null;
}

final Set<Sdk> sdksFromDependencies = new LinkedHashSet<>();
Set<Sdk> sdksFromDependencies = new LinkedHashSet<>();
OrderEnumerator enumerator = OrderEnumerator.orderEntries(module).runtimeOnly().recursively();
if (productionOnly) {
enumerator = enumerator.productionOnly();
}
enumerator.forEachModule(module1 ->
{
enumerator.forEachModule(module1 -> {
Sdk sdk = ModuleUtilCore.getSdk(module1, JavaModuleExtension.class);
if (sdk != null && sdk.getSdkType().equals(moduleSdk.getSdkType())) {
sdksFromDependencies.add(sdk);
Expand Down
Loading
Loading