Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2019-09-19 17:02:40 +0000
committerStephan Herrmann2019-09-19 18:06:50 +0000
commit58a8eaf64799638b186b2872df765d5e46eb6ec8 (patch)
tree667f87528df2a9a1278972820551bc1f8fa66ba4 /org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl
parent8a9a5930bfc43339ced39d167cd750459ff872f2 (diff)
downloadorg.eclipse.objectteams-58a8eaf64799638b186b2872df765d5e46eb6ec8.tar.gz
org.eclipse.objectteams-58a8eaf64799638b186b2872df765d5e46eb6ec8.tar.xz
org.eclipse.objectteams-58a8eaf64799638b186b2872df765d5e46eb6ec8.zip
update jdt.core to I20190919-0850 after BETA_JAVA13 merge
bump up to 3.20.0.OTDT_r276
Diffstat (limited to 'org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl')
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java12
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IrritantSet.java7
2 files changed, 15 insertions, 4 deletions
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
index 9a3f867b6..7d9fa4f3d 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
@@ -294,6 +294,8 @@ public class CompilerOptions {
public static final String OPTION_EnablePreviews = "org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures"; //$NON-NLS-1$
public static final String OPTION_ReportPreviewFeatures = "org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures"; //$NON-NLS-1$
+ public static final String OPTION_ReportSuppressWarningNotFullyAnalysed = "org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed"; //$NON-NLS-1$
+
// Internally used option to allow debug framework compile evaluation snippets in context of modules, see bug 543604
public static final String OPTION_JdtDebugCompileMode = "org.eclipse.jdt.internal.debug.compile.mode"; //$NON-NLS-1$
@@ -433,6 +435,7 @@ public class CompilerOptions {
public static final int APILeak = IrritantSet.GROUP2 | ASTNode.Bit25;
public static final int UnstableAutoModuleName = IrritantSet.GROUP2 | ASTNode.Bit26;
public static final int PreviewFeatureUsed = IrritantSet.GROUP2 | ASTNode.Bit27;
+ public static final int SuppressWarningsNotAnalysed = IrritantSet.GROUP2 | ASTNode.Bit28;
//{ObjectTeams: OT/J specific problems/irritants:
@@ -973,6 +976,8 @@ public class CompilerOptions {
return OPTION_ReportUnstableAutoModuleName;
case PreviewFeatureUsed:
return OPTION_ReportPreviewFeatures;
+ case SuppressWarningsNotAnalysed:
+ return OPTION_ReportSuppressWarningNotFullyAnalysed;
}
return null;
}
@@ -1237,7 +1242,8 @@ public class CompilerOptions {
OPTION_ReportUnlikelyCollectionMethodArgumentType,
OPTION_ReportUnlikelyEqualsArgumentType,
OPTION_ReportAPILeak,
- OPTION_ReportPreviewFeatures
+ OPTION_ReportPreviewFeatures,
+ OPTION_ReportSuppressWarningNotFullyAnalysed
};
return result;
}
@@ -1727,6 +1733,7 @@ public class CompilerOptions {
optionsMap.put(OPTION_ReportUnstableAutoModuleName, getSeverityString(UnstableAutoModuleName));
optionsMap.put(OPTION_EnablePreviews, this.enablePreviewFeatures ? ENABLED : DISABLED);
optionsMap.put(OPTION_ReportPreviewFeatures, getSeverityString(PreviewFeatureUsed));
+ optionsMap.put(OPTION_ReportSuppressWarningNotFullyAnalysed, getSeverityString(SuppressWarningsNotAnalysed));
return optionsMap;
}
@@ -2505,6 +2512,8 @@ public class CompilerOptions {
}
if ((optionValue = optionsMap.get(OPTION_ReportPreviewFeatures)) != null)
updateSeverity(PreviewFeatureUsed, optionValue);
+ if ((optionValue = optionsMap.get(OPTION_ReportSuppressWarningNotFullyAnalysed)) != null)
+ updateSeverity(SuppressWarningsNotAnalysed, optionValue);
if ((optionValue = optionsMap.get(OPTION_JdtDebugCompileMode)) != null) {
if (ENABLED.equals(optionValue)) {
@@ -2653,6 +2662,7 @@ public class CompilerOptions {
buf.append("\n\t- unlikely argument types for equals(): ").append(getSeverityString(UnlikelyEqualsArgumentType)); //$NON-NLS-1$
buf.append("\n\t- API leak: ").append(getSeverityString(APILeak)); //$NON-NLS-1$
buf.append("\n\t- unstable auto module name: ").append(getSeverityString(UnstableAutoModuleName)); //$NON-NLS-1$
+ buf.append("\n\t- SuppressWarnings not fully analysed: ").append(getSeverityString(SuppressWarningsNotAnalysed)); //$NON-NLS-1$
//{ObjectTeams
buf.append("\n\t- decapsulation : ").append(this.decapsulation); //$NON-NLS-1$
buf.append("\n\t- report if not exactly one basecall in callin method : ").append(getSeverityString(NotExactlyOneBasecall)); //$NON-NLS-1$
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IrritantSet.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IrritantSet.java
index cf6ffed13..82dd7ad30 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IrritantSet.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IrritantSet.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2018 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -91,7 +91,7 @@ public class IrritantSet {
public static final IrritantSet PREVIEW = new IrritantSet(CompilerOptions.PreviewFeatureUsed);
public static final IrritantSet COMPILER_DEFAULT_ERRORS = new IrritantSet(0); // no optional error by default
public static final IrritantSet COMPILER_DEFAULT_WARNINGS = new IrritantSet(0); // see static initializer below
- public static final IrritantSet COMPILER_DEFAULT_INFOS = new IrritantSet(0); // As of now, no default values
+ public static final IrritantSet COMPILER_DEFAULT_INFOS = new IrritantSet(0); // see static initializer below
//{ObjectTeams: new irritants:
public static final IrritantSet NOT_EXACTLY_ONE_BASECALL = new IrritantSet(
CompilerOptions.NotExactlyOneBasecall);
@@ -142,7 +142,8 @@ public class IrritantSet {
COMPILER_DEFAULT_INFOS
// group-2 infos enabled by default
.set(
- CompilerOptions.UnlikelyEqualsArgumentType);
+ CompilerOptions.UnlikelyEqualsArgumentType
+ | CompilerOptions.SuppressWarningsNotAnalysed);
COMPILER_DEFAULT_WARNINGS
//{ObjectTeams: default to warning (group 3):

Back to the top