Skip to content

Allow mainClass to be configured with unicode characters #383

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
Jinbo Wang (testforstephen) merged 1 commit into from
Sep 13, 2021
Merged

Allow mainClass to be configured with unicode characters #383

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
43 changes: 34 additions & 9 deletions ...lugin/src/main/java/com/microsoft/java/debug/plugin/internal/ResolveMainClassHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2017 Microsoft Corporation and others.
* Copyright (c) 2017-2021 Microsoft Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Expand All @@ -22,6 +22,8 @@
import java.util.logging.Logger;
import java.util.stream.Collectors;

import javax.lang.model.SourceVersion;

import org.apache.commons.lang3.StringUtils;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
Expand All @@ -47,8 +49,10 @@

public class ResolveMainClassHandler {
private static final Logger logger = Logger.getLogger(Configuration.LOGGER_NAME);
// Java command line supports two kinds of main class format: <mainclass> and <module>[/<mainclass>]
private static final String CLASSNAME_REGX = "([$\\w]+\\.)*[$\\w]+(/([$\\w]+\\.)*[$\\w]+)?";
private static final int CONFIGERROR_INVALID_CLASS_NAME = 1;
private static final int CONFIGERROR_MAIN_CLASS_NOT_EXIST = 2;
private static final int CONFIGERROR_MAIN_CLASS_NOT_UNIQUE = 3;
private static final int CONFIGERROR_INVALID_JAVA_PROJECT = 4;

/**
* resolve main class and project name.
Expand Down Expand Up @@ -185,23 +189,41 @@ private ValidationResponse validateLaunchConfigCore(List<Object> arguments) thro
private ValidationResult validateMainClass(final String mainClass, final String projectName, boolean containsExternalClasspaths) throws CoreException {
if (StringUtils.isEmpty(mainClass)) {
return new ValidationResult(true);
} else if (!mainClass.matches(CLASSNAME_REGX)) {
return new ValidationResult(false, String.format("ConfigError: '%s' is not a valid class name.", mainClass));
} else if (!isValidMainClassName(mainClass)) {
return new ValidationResult(false, String.format("ConfigError: '%s' is not a valid class name.", mainClass),
CONFIGERROR_INVALID_CLASS_NAME);
}

if (!containsExternalClasspaths && StringUtils.isEmpty(projectName)) {
List<IJavaProject> javaProjects = searchClassInProjectClasspaths(mainClass);
if (javaProjects.size() == 0) {
return new ValidationResult(false, String.format("ConfigError: Main class '%s' doesn't exist in the workspace.", mainClass));
return new ValidationResult(false, String.format("ConfigError: Main class '%s' doesn't exist in the workspace.", mainClass),
CONFIGERROR_MAIN_CLASS_NOT_EXIST);
}
if (javaProjects.size() > 1) {
return new ValidationResult(false, String.format("ConfigError: Main class '%s' isn't unique in the workspace.", mainClass));
return new ValidationResult(false, String.format("ConfigError: Main class '%s' isn't unique in the workspace.", mainClass),
CONFIGERROR_MAIN_CLASS_NOT_UNIQUE);
}
}

return new ValidationResult(true);
}

// Java command line supports two kinds of main class format: <mainclass> and <module>[/<mainclass>]
private boolean isValidMainClassName(String mainClass) {
if (StringUtils.isEmpty(mainClass)) {
Comment thread
testforstephen marked this conversation as resolved.
return true;
}

int index = mainClass.indexOf('/');
if (index == -1) {
return SourceVersion.isName(mainClass);
}

return SourceVersion.isName(mainClass.substring(0, index))
&& SourceVersion.isName(mainClass.substring(index + 1));
}

private List<IJavaProject> searchClassInProjectClasspaths(String fullyQualifiedClassName) throws CoreException {
return ResolveClasspathsHandler.getJavaProjectFromType(fullyQualifiedClassName);
}
Expand All @@ -212,7 +234,8 @@ private ValidationResult validateProjectName(final String mainClass, final Strin
}

if (JdtUtils.getJavaProject(projectName) == null) {
return new ValidationResult(false, String.format("ConfigError: The project '%s' is not a valid java project.", projectName));
return new ValidationResult(false, String.format("ConfigError: The project '%s' is not a valid java project.", projectName),
CONFIGERROR_INVALID_JAVA_PROJECT);
}

return new ValidationResult(true);
Expand Down Expand Up @@ -302,14 +325,16 @@ class ValidationResponse {
class ValidationResult {
boolean isValid;
String message;
int kind;

ValidationResult(boolean isValid) {
this.isValid = isValid;
}

ValidationResult(boolean isValid, String message) {
ValidationResult(boolean isValid, String message, int kind) {
this.isValid = isValid;
this.message = message;
this.kind = kind;
}
}
}