From a80d6169947fe0f4ae563c736c4eb970e801d43d Mon Sep 17 00:00:00 2001
From: Gesa HENTSCHKE <Gesa.HENTSCHKE@bachmann.info>
Date: Thu, 3 Aug 2023 14:25:07 +0200
Subject: [PATCH] Remove hide clangd property and preference pages

The hiding of the properties page should be done by vendors and not in
this plugin.
---
 .../META-INF/MANIFEST.MF                      |  3 +-
 bundles/org.eclipse.cdt.lsp.clangd/plugin.xml | 24 --------------
 .../ClangdLanguageServerProviderActive.java   | 32 -------------------
 3 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/editor/expressions/ClangdLanguageServerProviderActive.java

diff --git a/bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF b/bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF
index e2378c3f..04dc92f4 100644
--- a/bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF
@@ -29,8 +29,7 @@ Require-Bundle: org.eclipse.cdt.lsp;bundle-version="0.0.0",
  org.eclipse.ui.editors;bundle-version="0.0.0",
  org.eclipse.ui.ide;bundle-version="0.0.0",
  org.eclipse.ui.workbench;bundle-version="0.0.0",
- org.eclipse.ui.workbench.texteditor;bundle-version="0.0.0",
- org.eclipse.ui;bundle-version="0.0.0"
+ org.eclipse.ui.workbench.texteditor;bundle-version="0.0.0"
 Bundle-Activator: org.eclipse.cdt.lsp.internal.clangd.editor.ClangdPlugin
 Service-Component: OSGI-INF/org.eclipse.cdt.lsp.clangd.BuiltinClangdOptionsDefaults.xml,
  OSGI-INF/org.eclipse.cdt.lsp.internal.clangd.ClangdConfigurationAccess.xml,
diff --git a/bundles/org.eclipse.cdt.lsp.clangd/plugin.xml b/bundles/org.eclipse.cdt.lsp.clangd/plugin.xml
index 80d39868..d5e57c65 100644
--- a/bundles/org.eclipse.cdt.lsp.clangd/plugin.xml
+++ b/bundles/org.eclipse.cdt.lsp.clangd/plugin.xml
@@ -58,13 +58,6 @@
             properties="active"
             type="java.lang.Object">
       </propertyTester>
-      <propertyTester
-            class="org.eclipse.cdt.lsp.internal.clangd.editor.expressions.ClangdLanguageServerProviderActive"
-            id="org.eclipse.cdt.lsp.clangd.provider.active"
-            namespace="org.eclipse.cdt.lsp.clangd.provider"
-            properties="active"
-            type="java.lang.Object">
-      </propertyTester>
    </extension>
    <extension
          point="org.eclipse.cdt.lsp.serverProvider">
@@ -120,22 +113,5 @@
          </command>
       </menuContribution>
    </extension>
-   <extension
-         point="org.eclipse.ui.activities">
-      <activity
-            id="org.eclipse.cdt.lsp.clangd.ClangdLanguageProvider"
-            name="CDT Clangd Language Server Provider">
-         <enabledWhen>
-            <test
-                  forcePluginActivation="true"
-                  property="org.eclipse.cdt.lsp.clangd.provider.active">
-            </test></enabledWhen>
-      </activity>
-      <activityPatternBinding
-            activityId="org.eclipse.cdt.lsp.clangd.ClangdLanguageProvider"
-            isEqualityPattern="false"
-            pattern="org.eclipse.cdt.lsp.clangd/org.eclipse.cdt.lsp.clangd.editor.*">
-      </activityPatternBinding>
-   </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/editor/expressions/ClangdLanguageServerProviderActive.java b/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/editor/expressions/ClangdLanguageServerProviderActive.java
deleted file mode 100644
index 6c981fa0..00000000
--- a/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/editor/expressions/ClangdLanguageServerProviderActive.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2023 Bachmann electronic GmbH and others.
- * This program and the accompanying materials are made
- * 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
- *******************************************************************************/
-
-package org.eclipse.cdt.lsp.internal.clangd.editor.expressions;
-
-import org.eclipse.cdt.lsp.LspPlugin;
-import org.eclipse.cdt.lsp.internal.clangd.ClangdLanguageServerProvider;
-import org.eclipse.cdt.lsp.server.ICLanguageServerProvider;
-import org.eclipse.core.expressions.PropertyTester;
-
-public final class ClangdLanguageServerProviderActive extends PropertyTester {
-	private final ICLanguageServerProvider provider;
-
-	public ClangdLanguageServerProviderActive() {
-		this.provider = LspPlugin.getDefault().getCLanguageServerProvider();
-	}
-
-	@Override
-	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
-		return provider instanceof ClangdLanguageServerProvider;
-	}
-
-}