From 0241bab7e14ef1f04fba9f4cd821342944bbd516 Mon Sep 17 00:00:00 2001
From: Gesa HENTSCHKE <Gesa.HENTSCHKE@bachmann.info>
Date: Wed, 29 Jan 2025 14:43:19 +0100
Subject: [PATCH] rename

---
 bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF     | 4 ++--
 ...langd.internal.config.BuiltinClangdOptionsDefaults2.xml} | 6 +++---
 ...dt.lsp.clangd.internal.config.ClangdMetadataDefaults.xml | 2 +-
 ...ngdOptions2Defaults.java => ClangdOptionsDefaults2.java} | 2 +-
 ...ons2Defaults.java => BuiltinClangdOptionsDefaults2.java} | 6 +++---
 .../lsp/clangd/internal/config/ClangdMetadataDefaults.java  | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/{org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptions2Defaults.xml => org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptionsDefaults2.xml} (85%)
 rename bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/{ClangdOptions2Defaults.java => ClangdOptionsDefaults2.java} (89%)
 rename bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/config/{BuiltinClangdOptions2Defaults.java => BuiltinClangdOptionsDefaults2.java} (80%)

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 610bb17b..07dcd944 100644
--- a/bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF
@@ -30,8 +30,8 @@ Require-Bundle: org.eclipse.cdt.lsp;bundle-version="0.0.0",
  org.yaml.snakeyaml;bundle-version="0.0.0",
  org.eclipse.tm4e.language_pack;bundle-version="0.0.0",
  org.eclipse.ui.console;bundle-version="0.0.0"
-Service-Component: OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptions2Defaults.xml,
- OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptionsDefaults.xml,
+Service-Component: OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptionsDefaults.xml,
+ OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptionsDefaults2.xml,
  OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangFormatFileHandler.xml,
  OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationAccess.xml,
  OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationFileManager.xml,
diff --git a/bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptions2Defaults.xml b/bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptionsDefaults2.xml
similarity index 85%
rename from bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptions2Defaults.xml
rename to bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptionsDefaults2.xml
index 58acccb0..4e7db36b 100644
--- a/bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptions2Defaults.xml
+++ b/bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptionsDefaults2.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptions2Defaults">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptionsDefaults2">
    <property name="service.ranking" type="Integer" value="0"/>
    <service>
-      <provide interface="org.eclipse.cdt.lsp.clangd.ClangdOptions2Defaults"/>
+      <provide interface="org.eclipse.cdt.lsp.clangd.ClangdOptionsDefaults2"/>
    </service>
-   <implementation class="org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptions2Defaults"/>
+   <implementation class="org.eclipse.cdt.lsp.clangd.internal.config.BuiltinClangdOptionsDefaults2"/>
 </scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdMetadataDefaults.xml b/bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdMetadataDefaults.xml
index f1765683..7ec424c4 100644
--- a/bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdMetadataDefaults.xml
+++ b/bundles/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdMetadataDefaults.xml
@@ -4,6 +4,6 @@
       <provide interface="org.eclipse.cdt.lsp.clangd.ClangdMetadata2"/>
    </service>
    <reference cardinality="1..1" field="defaults" interface="org.eclipse.cdt.lsp.clangd.ClangdOptionsDefaults" name="defaults"/>
-   <reference cardinality="1..1" field="defaults2" interface="org.eclipse.cdt.lsp.clangd.ClangdOptions2Defaults" name="defaults2"/>
+   <reference cardinality="1..1" field="defaults2" interface="org.eclipse.cdt.lsp.clangd.ClangdOptionsDefaults2" name="defaults2"/>
    <implementation class="org.eclipse.cdt.lsp.clangd.internal.config.ClangdMetadataDefaults"/>
 </scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdOptions2Defaults.java b/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdOptionsDefaults2.java
similarity index 89%
rename from bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdOptions2Defaults.java
rename to bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdOptionsDefaults2.java
index b3092d34..a6842867 100644
--- a/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdOptions2Defaults.java
+++ b/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdOptionsDefaults2.java
@@ -15,6 +15,6 @@
 /**
  * @since 2.2
  */
-public interface ClangdOptions2Defaults extends ClangdOptions2 {
+public interface ClangdOptionsDefaults2 extends ClangdOptions2 {
 
 }
diff --git a/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/config/BuiltinClangdOptions2Defaults.java b/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/config/BuiltinClangdOptionsDefaults2.java
similarity index 80%
rename from bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/config/BuiltinClangdOptions2Defaults.java
rename to bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/config/BuiltinClangdOptionsDefaults2.java
index 03a580d2..8e8d0808 100644
--- a/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/config/BuiltinClangdOptions2Defaults.java
+++ b/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/config/BuiltinClangdOptionsDefaults2.java
@@ -12,18 +12,18 @@
 
 package org.eclipse.cdt.lsp.clangd.internal.config;
 
-import org.eclipse.cdt.lsp.clangd.ClangdOptions2Defaults;
+import org.eclipse.cdt.lsp.clangd.ClangdOptionsDefaults2;
 import org.osgi.service.component.annotations.Component;
 
 /**
  * Provides the default clangd extended options for cdt-lsp.
  */
 @Component(property = { "service.ranking:Integer=0" })
-public class BuiltinClangdOptions2Defaults extends BuiltinClangdOptionsDefaults implements ClangdOptions2Defaults {
+public class BuiltinClangdOptionsDefaults2 extends BuiltinClangdOptionsDefaults implements ClangdOptionsDefaults2 {
 
 	@Override
 	public boolean logToConsole() {
-		return false;
+		return true;
 	}
 
 }
diff --git a/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/config/ClangdMetadataDefaults.java b/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/config/ClangdMetadataDefaults.java
index 1bc1af00..b4656335 100644
--- a/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/config/ClangdMetadataDefaults.java
+++ b/bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/config/ClangdMetadataDefaults.java
@@ -16,7 +16,7 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.cdt.lsp.clangd.ClangdMetadata2;
-import org.eclipse.cdt.lsp.clangd.ClangdOptions2Defaults;
+import org.eclipse.cdt.lsp.clangd.ClangdOptionsDefaults2;
 import org.eclipse.cdt.lsp.clangd.ClangdOptionsDefaults;
 import org.eclipse.cdt.lsp.clangd.internal.ui.LspEditorUiMessages;
 import org.eclipse.core.runtime.preferences.PreferenceMetadata;
@@ -30,7 +30,7 @@ public class ClangdMetadataDefaults implements ClangdMetadata2 {
 	private ClangdOptionsDefaults defaults;
 
 	@Reference
-	private ClangdOptions2Defaults defaults2;
+	private ClangdOptionsDefaults2 defaults2;
 
 	@Override
 	public PreferenceMetadata<String> clangdPath() {