Skip to content
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

React to removal of 'is60orHigher' from JDT. #3353

Merged
merged 1 commit into from
Dec 31, 2024
Merged

React to removal of 'is60orHigher' from JDT. #3353

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
2 changes: 1 addition & 1 deletion ...ipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/contentassist/ParameterGuesser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ private PrimitiveType.Code getPrimitiveTypeCode(String type) {
if (code != null) {
return code;
}
if (fEnclosingElement != null && JavaModelUtil.is50OrHigher(fEnclosingElement.getJavaProject())) {
if (fEnclosingElement != null) {
if (code == PrimitiveType.SHORT) {
if ("java.lang.Short".equals(type)) { //$NON-NLS-1$
return code;
Expand Down
5 changes: 1 addition & 4 deletions ...lipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/corrections/QuickFixProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import org.eclipse.jdt.core.dom.ASTNode;
import org.eclipse.jdt.core.manipulation.CUCorrectionProposalCore;
import org.eclipse.jdt.core.manipulation.ChangeCorrectionProposalCore;
import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
import org.eclipse.jdt.internal.ui.text.correction.IProposalRelevance;
import org.eclipse.jdt.internal.ui.text.correction.UnInitializedFinalFieldBaseSubProcessor;
import org.eclipse.jdt.internal.ui.text.correction.proposals.AddImportCorrectionProposalCore;
Expand Down Expand Up @@ -683,9 +682,7 @@ private void process(CodeActionParams params, IInvocationContext context, IProbl
String str = problem.toString();
System.out.println(str);
}
if (JavaModelUtil.is50OrHigher(context.getCompilationUnit().getJavaProject())) {
SuppressWarningsSubProcessor.addSuppressWarningsProposals(context, problem, proposals);
}
SuppressWarningsSubProcessor.addSuppressWarningsProposals(context, problem, proposals);
// ConfigureProblemSeveritySubProcessor.addConfigureProblemSeverityProposal(context,
// problem, proposals);
}
Expand Down
6 changes: 0 additions & 6 deletions ...se.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/GenerateToStringHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.dom.ASTNode;
import org.eclipse.jdt.core.dom.CompilationUnit;
Expand All @@ -41,7 +40,6 @@
import org.eclipse.jdt.internal.corext.codemanipulation.tostringgeneration.ToStringGenerationSettingsCore;
import org.eclipse.jdt.internal.corext.codemanipulation.tostringgeneration.ToStringGenerationSettingsCore.CustomBuilderSettings;
import org.eclipse.jdt.internal.corext.dom.ASTNodes;
import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
import org.eclipse.jdt.ls.core.internal.corrections.DiagnosticsHelper;
import org.eclipse.jdt.ls.core.internal.handlers.JdtDomModels.BindingComparator;
Expand Down Expand Up @@ -199,10 +197,6 @@ public static TextEdit generateToString(IType type, LspVariableBinding[] fields,
settings.limitElements = preferences.getGenerateToStringLimitElements() > 0;
settings.limitValue = Math.max(preferences.getGenerateToStringLimitElements(), 0);
settings.customBuilderSettings = new CustomBuilderSettings();
if (type.getCompilationUnit().getJavaProject() != null) {
String version = type.getCompilationUnit().getJavaProject().getOption(JavaCore.COMPILER_SOURCE, true);
settings.is60orHigher = !JavaModelUtil.isVersionLessThan(version, JavaCore.VERSION_1_6);
}

return generateToString(type, fields, settings, insertPosition, monitor);
}
Expand Down
1 change: 0 additions & 1 deletion ...t.ls.tests/src/org/eclipse/jdt/ls/core/internal/handlers/GenerateToStringHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ public void testGenerateToString_customizedSettings() throws ValidateEditExcepti
settings.limitElements = true;
settings.limitValue = 10;
settings.customBuilderSettings = new CustomBuilderSettings();
settings.is60orHigher = true;
generateToString(unit.findPrimaryType(), settings);

/* @formatter:off */
Expand Down
Loading