refactor: rename contentTester ist editorTest

Author: ghentschke

org.eclipse.cdt.lsp/schema/serverProvider.exsd

@@ -21,7 +21,7 @@
       <complexType>
          <sequence>
             <element ref="server"/>
-            <element ref="contentTester" minOccurs="0" maxOccurs="1"/>
+            <element ref="editorTest" minOccurs="0" maxOccurs="1"/>
          </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
@@ -68,10 +68,10 @@
       </complexType>
    </element>
 
-   <element name="contentTester">
+   <element name="editorTest">
       <annotation>
          <documentation>
-            Test if the content should be opened by the C/C++ LSP based editor
+            Test whether the editor input should be opened by the C/C++ LSP based editor
          </documentation>
       </annotation>
       <complexType>

org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/CLanguageServerRegistry.java

@@ -30,7 +30,7 @@
 public class CLanguageServerRegistry {
 	private static final String EXTENSION_ID = LspPlugin.PLUGIN_ID + ".serverProvider"; //$NON-NLS-1$
 	private static final String SERVER_ELEMENT = "server"; //$NON-NLS-1$
-	private static final String ELEMENT_CONTENT_TESTER = "contentTester"; //$NON-NLS-1$
+	private static final String ELEMENT_EDITOR_TEST = "editorTest"; //$NON-NLS-1$
 	private static final String CLASS = "class"; //$NON-NLS-1$
 	private static final String ENABLED_WHEN_ATTRIBUTE = "enabledWhen"; //$NON-NLS-1$
 	private final IExtensionPoint cExtensionPoint;
@@ -40,7 +40,7 @@ public CLanguageServerRegistry() {
 	}
 
 	public ICEditorTest createCEditorTest() throws InvalidRegistryObjectException {
-		ICEditorTest propertyTester = (ICEditorTest) getInstanceFromExtension(ELEMENT_CONTENT_TESTER,ICEditorTest.class);
+		ICEditorTest propertyTester = (ICEditorTest) getInstanceFromExtension(ELEMENT_EDITOR_TEST, ICEditorTest.class);
 		if (propertyTester == null) {
 			LspPlugin.logWarning("No C/C++ editor input tester defined");
 			return new DefaultCEditorTest();
@@ -55,10 +55,10 @@ public ICLanguageServerCommandProvider createCLanguageServerCommandProvider() {
 		if (provider == null) {
 			LspPlugin.logWarning("No C/C++ language server defined");
 		}
-				
+
 		return provider;
 	}
-	
+
 	public EnableExpression getEnablementExpression() {
 		EnableExpression enableExpression = null;
 		for (IConfigurationElement configurationElement : cExtensionPoint.getConfigurationElements()) {
@@ -70,7 +70,8 @@ public EnableExpression getEnablementExpression() {
 						IConfigurationElement[] enabledWhenChildren = enabledWhen.getChildren();
 						if (enabledWhenChildren.length == 1) {
 							try {
-								enableExpression = new EnableExpression(this::getEvaluationContext, ExpressionConverter.getDefault().perform(enabledWhenChildren[0]));
+								enableExpression = new EnableExpression(this::getEvaluationContext,
+										ExpressionConverter.getDefault().perform(enabledWhenChildren[0]));
 							} catch (CoreException e) {
 								LspPlugin.logWarning(e.getMessage(), e);
 							}
@@ -81,7 +82,7 @@ public EnableExpression getEnablementExpression() {
 		}
 		return enableExpression;
 	}
-	
+
 	private IEvaluationContext getEvaluationContext() {
 		return Optional.ofNullable(PlatformUI.getWorkbench().getService(IHandlerService.class)).map(IHandlerService::getCurrentState).orElse(null);
 	}

org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/server/EnableExpression.java

@@ -4,9 +4,7 @@
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
  * SPDX-License-Identifier: EPL-2.0
- * 
  * Contributors:
- * 
  * Gesa Hentschke (Bachmann electronic GmbH) - initial implementation
  *******************************************************************************/
 
@@ -22,16 +20,16 @@
 import org.eclipse.core.runtime.CoreException;
 
 public final class EnableExpression {
-	private final Expression expression;
-	private final Supplier<IEvaluationContext> parent;
+	private final Expression cExpression;
+	private final Supplier<IEvaluationContext> cParent;
 
 	public EnableExpression(Supplier<IEvaluationContext> parent, Expression expression) {
-		this.expression = expression;
-		this.parent = parent;
+		this.cExpression = expression;
+		this.cParent = parent;
 	}
 
 	/**
-	 * Evaluates enable expression with the given context. The context defualtVariable can be set by the input document.
+	 * Evaluates enable expression with the given context and document.
 	 *
 	 * @return true if expression evaluates to true, false otherwise
 	 */
@@ -40,9 +38,9 @@ public boolean evaluate(Object document) {
 			if (document == null) {
 				document = new Object();
 			}
-			final var context = new EvaluationContext(parent.get(), document);
+			final var context = new EvaluationContext(cParent.get(), document);
 			context.setAllowPluginActivation(true);
-			return expression.evaluate(context).equals(EvaluationResult.TRUE);
+			return cExpression.evaluate(context).equals(EvaluationResult.TRUE);
 		} catch (CoreException e) {
 			LspPlugin.logError("Error occured during evaluation of enablement expression", e); //$NON-NLS-1$
 		}