8000 [#422] reset-to-default only preferences used on page by ghentschke · Pull Request #423 · eclipse-cdt/cdt-lsp · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[#422] reset-to-default only preferences used on page #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 17, 2025
Merged

[#422] reset-to-default only preferences used on page #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c116b9a
[#422] reset-to-default only preferences used on page
ghentschke Feb 17, 2025
25e7a32
set initial capacity
ghentschke Feb 17, 2025
f087b80
remove ClangdContentAssist to Clangd preferences
ghentschke Feb 17, 2025
7323df8
remove unused/wrong includes
ghentschke Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ Service-Component: OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangForm
OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdCommandLineValidator.xml,
OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationAccess.xml,
OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationFileManager.xml,
OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdContentAssistConfigurationAccess.xml,
OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdContentAssistMetadataDefaults.xml,
OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdFallbackManager.xml,
OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdMetadataDefaults.xml,
OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.DefaultClangdCompilationDatabaseSettings.xml
Expand Down
1 change: 0 additions & 1 deletion ....clangd/OSGI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationAccess.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<service>
<provide interface="org.eclipse.cdt.lsp.clangd.ClangdConfiguration"/>
</service>
<reference cardinality="1..1" field="contentAssistConfiguration" interface="org.eclipse.cdt.lsp.clangd.ClangdContentAssistConfiguration" name="contentAssistConfiguration"/>
<reference cardinality="1..1" field="metadata" interface="org.eclipse.cdt.lsp.clangd.ClangdMetadata" name="metadata"/>
<reference cardinality="1..1" field="workspace" interface="org.eclipse.core.resources.IWorkspace" name="workspace"/>
<implementation class="org.eclipse.cdt.lsp.clangd.internal.config.ClangdConfigurationAccess"/>
Expand Down
9 changes: 0 additions & 9 deletions ...INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdContentAssistConfigurationAccess.xml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions ...GI-INF/org.eclipse.cdt.lsp.clangd.internal.config.ClangdContentAssistMetadataDefaults.xml
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions bundles/org.eclipse.cdt.lsp.clangd/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
<initializer
class="org.eclipse.cdt.lsp.clangd.internal.config.ClangdPreferenceInitializer">
</initializer>
<initializer
class="org.eclipse.cdt.lsp.clangd.internal.config.ClangdContentAssistPreferenceInitializer">
</initializer>
</extension>
<extension
point="org.eclipse.ui.preferencePages">
Expand Down
26 changes: 0 additions & 26 deletions ...lipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdContentAssistConfiguration.java
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions ...rg.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdContentAssistMetadata.java
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions ...org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdContentAssistOptions.java
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions ...g.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdContentAssistQualifier.java
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,17 @@ public interface ClangdMetadata extends ConfigurationMetadata {
LspEditorUiMessages.LspEditorPreferencePage_Validate_clangd_options, //
LspEditorUiMessages.LspEditorPreferencePage_Validate_clangd_options_description);

/**
* Returns the metadata for the "Fill function arguments and show guessed arguments" option.
*
* @see ClangdOptions#fillFunctionArguments()
*
* @since 3.0
*/
PreferenceMetadata<Boolean> fillFunctionArguments = new PreferenceMetadata<>(Boolean.class, //
"fill_function_arguments", //$NON-NLS-1$
true, //
LspEditorUiMessages.ContentAssistConfigurationPage_fill_function_arguments,
LspEditorUiMessages.ContentAssistConfigurationPage_fill_function_arguments_description);

}
10 changes: 10 additions & 0 deletions bundles/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/clangd/ClangdOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,14 @@ default boolean logToConsole() {
default boolean validateClangdOptions() {
return true;
}

/**
* When disabled, completions contain only parentheses for function calls. When enabled, completions also contain placeholders for function parameters
* @return true if completions shall also contain placeholders for function parameters
*
* @since 3.0
*/
default boolean fillFunctionArguments() {
return true;
}
}
8 changes: 1 addition & 7 deletions ....lsp.clangd/src/org/eclipse/cdt/lsp/clangd/internal/config/ClangdConfigurationAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
import java.util.Optional;

import org.eclipse.cdt.lsp.clangd.ClangdConfiguration;
import org.eclipse.cdt.lsp.clangd.ClangdContentAssistConfiguration;
import org.eclipse.cdt.lsp.clangd.ClangdContentAssistOptions;
import org.eclipse.cdt.lsp.clangd.ClangdMetadata;
import org.eclipse.cdt.lsp.clangd.ClangdOptions;
import org.eclipse.cdt.lsp.clangd.ClangdQualifier;
Expand All @@ -38,9 +36,6 @@
@Component
public final class ClangdConfigurationAccess extends ConfigurationAccess implements ClangdConfiguration {

@Reference
private ClangdContentAssistConfiguration contentAssistConfiguration;

@Reference
private ClangdMetadata metadata;

Expand Down Expand Up @@ -107,9 +102,8 @@ public List<String> commands(Object context) {
if (!options.queryDriver().isBlank()) {
list.add(NLS.bind("--query-driver={0}", options.queryDriver())); //$NON-NLS-1$
}
ClangdContentAssistOptions contentAssistOptions = contentAssistConfiguration.options(context);
list.add(NLS.bind("--function-arg-placeholders={0}", //$NON-NLS-1$
String.valueOf(contentAssistOptions.fillFunctionArguments())));
String.valueOf(options.fillFunctionArguments())));

list.addAll(options.additionalOptions());
return list;
Expand Down
83 changes: 0 additions & 83 deletions ...rc/org/eclipse/cdt/lsp/clangd/internal/config/ClangdContentAssistConfigurationAccess.java
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions ...d/src/org/eclipse/cdt/lsp/clangd/internal/config/ClangdContentAssistMetadataDefaults.java
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions .../org/eclipse/cdt/lsp/clangd/internal/config/ClangdContentAssistPreferenceInitializer.java
View file
Open in desktop

This file was deleted.

Loading
Loading
0