Revert some changes in jdt.core to match upstream

- Undo `@since` and cosmetic changes
- Remove changes from CompletionEngine

Signed-off-by: David Thompson <[email protected]>

Author: datho7561

org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java

@@ -51,7 +51,6 @@
 import org.eclipse.jdt.core.search.SearchPattern;
 import org.eclipse.jdt.core.search.SearchRequestor;
 import org.eclipse.jdt.internal.codeassist.complete.*;
-import org.eclipse.jdt.internal.codeassist.impl.AssistOptions;
 import org.eclipse.jdt.internal.codeassist.impl.AssistParser;
 import org.eclipse.jdt.internal.codeassist.impl.Engine;
 import org.eclipse.jdt.internal.codeassist.impl.Keywords;
@@ -4183,7 +4182,7 @@ private void computeAlreadyDefinedName(
 		}
 	}
 
-	static int computeBaseRelevance(){
+	int computeBaseRelevance(){
 		return R_DEFAULT;
 	}
 
@@ -4803,22 +4802,18 @@ int computeRelevanceForCaseMatching(char[][] tokens, char[] proposalName) {
 	}
 
 	int computeRelevanceForCaseMatching(char[] token, char[] proposalName) {
-		return computeRelevanceForCaseMatching(token, proposalName, this.options);
-	}
-
-	static int computeRelevanceForCaseMatching(char[] token, char[] proposalName, AssistOptions options) {
 		if (CharOperation.equals(token, proposalName, true)) {
 			return R_EXACT_NAME + R_CASE;
 		} else if (CharOperation.equals(token, proposalName, false)) {
 			return R_EXACT_NAME;
 		} else if (CharOperation.prefixEquals(token, proposalName, false)) {
 			if (CharOperation.prefixEquals(token, proposalName, true))
 				return R_CASE;
-		} else if (options.camelCaseMatch && CharOperation.camelCaseMatch(token, proposalName)) {
+		} else if (this.options.camelCaseMatch && CharOperation.camelCaseMatch(token, proposalName)) {
 			return R_CAMEL_CASE;
-		} else if (options.substringMatch && CharOperation.substringMatch(token, proposalName)) {
+		} else if (this.options.substringMatch && CharOperation.substringMatch(token, proposalName)) {
 			return R_SUBSTRING;
-		} else if (options.subwordMatch && CharOperation.subWordMatch(token, proposalName)) {
+		} else if (this.options.subwordMatch && CharOperation.subWordMatch(token, proposalName)) {
 			return R_SUBWORD;
 		}
 		return 0;
@@ -5017,18 +5012,18 @@ int computeRelevanceForQualification(boolean prefixRequired) {
 		return 0;
 	}
 
-	static int computeRelevanceForResolution(){
+	int computeRelevanceForResolution(){
 		return computeRelevanceForResolution(true);
 	}
 
-	static int computeRelevanceForResolution(boolean isResolved){
+	int computeRelevanceForResolution(boolean isResolved){
 		if (isResolved) {
 			return R_RESOLVED;
 		}
 		return 0;
 	}
 
-	static int computeRelevanceForRestrictions(int accessRuleKind) {
+	int computeRelevanceForRestrictions(int accessRuleKind) {
 		if(accessRuleKind == IAccessRule.K_ACCESSIBLE) {
 			return R_NON_RESTRICTED;
 		}
@@ -13662,20 +13657,15 @@ private boolean isAllowingLongComputationProposals() {
 	 * <code>false</code> otherwise
 	 */
 	private boolean isFailedMatch(char[] token, char[] name) {
-		return isFailedMatch(token, name, this.options);
-	}
-
-	static boolean isFailedMatch(char[] token, char[] name, AssistOptions opt) {
-		if ((opt.substringMatch && CharOperation.substringMatch(token, name))
-				|| (opt.camelCaseMatch && CharOperation.camelCaseMatch(token, name))
+		if ((this.options.substringMatch && CharOperation.substringMatch(token, name))
+				|| (this.options.camelCaseMatch && CharOperation.camelCaseMatch(token, name))
 				|| CharOperation.prefixEquals(token, name, false)
-				|| (opt.subwordMatch && CharOperation.subWordMatch(token, name))) {
+				|| (this.options.subwordMatch && CharOperation.subWordMatch(token, name))) {
 			return false;
 		}
 
 		return true;
 	}
-
 	private boolean isForbidden(ReferenceBinding binding) {
 		for (int i = 0; i <= this.forbbidenBindingsPtr; i++) {
 			if(this.forbbidenBindings[i] == binding) {

org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java

@@ -69,7 +69,6 @@
  */
 public class CompilationUnit extends Openable implements ICompilationUnit, org.eclipse.jdt.internal.compiler.env.ICompilationUnit, SuffixConstants {
 	public static boolean DOM_BASED_OPERATIONS = Boolean.getBoolean(CompilationUnit.class.getSimpleName() + ".DOM_BASED_OPERATIONS"); //$NON-NLS-1$
-
 	private static final IImportDeclaration[] NO_IMPORTS = new IImportDeclaration[0];
 
 	protected final String name;
@@ -448,10 +447,14 @@ public void codeComplete(int offset, CompletionRequestor requestor, WorkingCopyO
 
 @Override
 public void codeComplete(int offset, CompletionRequestor requestor, WorkingCopyOwner workingCopyOwner, IProgressMonitor monitor) throws JavaModelException {
-
-	codeComplete(this,
+	codeComplete(
+			this,
 			isWorkingCopy() ? (org.eclipse.jdt.internal.compiler.env.ICompilationUnit) getOriginalElement() : this,
-			offset, requestor, workingCopyOwner, this, monitor);
+			offset,
+			requestor,
+			workingCopyOwner,
+			this,
+			monitor);
 }
 
 /**

org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/IJavaSearchDelegate.java

@@ -24,7 +24,7 @@
  *
  * This interface makes use of internal classes and is not considered stable or API.
  *
- * @since 3.42
+ * @since 3.41
  */
 public interface IJavaSearchDelegate {
 
@@ -41,4 +41,4 @@ public interface IJavaSearchDelegate {
 	 */
 	void locateMatches(MatchLocator locator, IJavaProject javaProject, PossibleMatch[] possibleMatches, int start, int length) throws CoreException;
 
-}
+}

org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchingNodeSet.java

@@ -52,6 +52,7 @@ public class MatchingNodeSet {
 SimpleSet possibleMatchingNodesSet = new SimpleSet(7);
 private final HashtableOfLong possibleMatchingNodesKeys = new HashtableOfLong(7);
 
+
 public MatchingNodeSet(boolean mustResolvePattern) {
 	super();
 	this.mustResolve = mustResolvePattern;
@@ -87,7 +88,6 @@ public int addMatch(ASTNode node, int matchLevel) {
 	}
 	return matchLevel;
 }
-
 public void addPossibleMatch(ASTNode node) {
 	// remove existing node at same position from set
 	// (case of recovery that created the same node several time
@@ -103,6 +103,7 @@ public void addPossibleMatch(ASTNode node) {
 }
 public void addTrustedMatch(ASTNode node, boolean isExact) {
 	addTrustedMatch(node, isExact ? EXACT_MATCH : POTENTIAL_MATCH);
+
 }
 void addTrustedMatch(ASTNode node, Integer level) {
 	// remove existing node at same position from set
@@ -117,7 +118,6 @@ void addTrustedMatch(ASTNode node, Integer level) {
 	this.matchingNodes.put(node, level);
 	this.matchingNodesKeys.put(key, node);
 }
-
 protected boolean hasPossibleNodes(int start, int end) {
 	Object[] nodes = this.possibleMatchingNodesSet.values;
 	for (Object n : nodes) {
@@ -131,7 +131,6 @@ protected boolean hasPossibleNodes(int start, int end) {
 	}
 	return false;
 }
-
 /**
  * Returns the matching nodes that are in the given range in the source order.
  */