From aa377d40c22088f9b4188a8d2b6357dd8a8386e5 Mon Sep 17 00:00:00 2001 From: Martin Weber Date: Wed, 27 May 2020 23:46:17 +0200 Subject: [PATCH] Bug 559674: eliminate 'lsp' (language settings provider) Change-Id: I8bcead6d09feefc6093cdd97349c26d563cd9f1f Signed-off-by: Martin Weber --- .../help_content_extension.xml | 4 ++-- .../doc/html/builtins-detection.xhtml | 2 +- .../doc/html/languageSettingsProviders.xhtml | 2 +- .../schema/participant.exsd | 14 +++++++------- .../help_content_extension.xml | 4 ++-- .../help_content_extension.xml | 4 ++-- .../help_content_extension.xml | 2 +- .../help_content_extension.xml | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/help_content_extension.xml b/cmake/org.eclipse.cdt.cmake.is.arm/help_content_extension.xml index 89a0db52ea1..1510752d6de 100644 --- a/cmake/org.eclipse.cdt.cmake.is.arm/help_content_extension.xml +++ b/cmake/org.eclipse.cdt.cmake.is.arm/help_content_extension.xml @@ -1,7 +1,7 @@ + path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_detection_participant_list"/> + path="/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/> \ No newline at end of file diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/builtins-detection.xhtml b/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/builtins-detection.xhtml index f9eb219e7e2..da100237195 100644 --- a/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/builtins-detection.xhtml +++ b/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/builtins-detection.xhtml @@ -75,7 +75,7 @@ td {

Compilers supported through separate plug-ins

- +

Enhanced Built-ins Detection Support

Some compilers, mainly those of the GNU Compiler Collection and derivatives, report different built-ins diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/languageSettingsProviders.xhtml b/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/languageSettingsProviders.xhtml index 3ae21f56596..85b5394fdd6 100644 --- a/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/languageSettingsProviders.xhtml +++ b/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/languageSettingsProviders.xhtml @@ -115,7 +115,7 @@ th, td {

Compilers supported through separate plug-ins

- +

CMAKE_EXPORT_COMPILE_COMMANDS Compiler Built-ins

This provider works similar to CMAKE_EXPORT_COMPILE_COMMANDS Parser, but invokes diff --git a/cmake/org.eclipse.cdt.cmake.is.core/schema/participant.exsd b/cmake/org.eclipse.cdt.cmake.is.core/schema/participant.exsd index 6b1e0026d1e..f8755b0f0f0 100644 --- a/cmake/org.eclipse.cdt.cmake.is.core/schema/participant.exsd +++ b/cmake/org.eclipse.cdt.cmake.is.core/schema/participant.exsd @@ -113,17 +113,17 @@ To provide online help that lists the supported compilers anlong with and the re the extension point <code>org.eclipse.help.contentExtension</code> can be used.<br/> Plugin <i>de.marw.cdt.cmake.core</i> provides predefined help-anchors that allow to integrate the online help: <ol> -<li><i>extra_lsp_detection_participant_list</i> for the CMAKE_EXPORT_COMPILE_COMMANDS Parser,</li> -<li><i>extra_lsp_detection_participant_builtins_list</i> and -<i>extra_lsp_detection_participant_builtins_enhanced_list</i> for the CMAKE_EXPORT_COMPILE_COMMANDS Compiler Built-ins Parser.</li> +<li><i>extra_detection_participant_list</i> for the commandline parser,</li> +<li><i>extra_detection_participant_builtins_list</i> and +<i>extra_lsp_detection_participant_builtins_enhanced_list</i> for the compiler built-ins parser.</li> </ol> Example file <code>help_content_extension.xml</code>: <pre> <contentExtension> <contribution content="doc/compiler.xhtml#lsp" - path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_lsp_detection_participant_list"/> + path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_detection_participant_list"/> <contribution content="doc/compiler.xhtml#builtins" - path="/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_lsp_detection_participant_builtins_list"/> + path="/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/> </contentExtension> </pre> </p> @@ -142,8 +142,8 @@ Some predifined parsers for tool arguments can be found in the classes <code& - The plugin org.eclipse.cdt.cmake.is.intel provides inplementations for various compiler made by Intel Corp.</br> -See, for example <code>de/marw/cmake/cdt/lsp/intel/IccToolDetectionParticipant.java</code>. + The plugin org.eclipse.cdt.cmake.is.intel provides implementations for various compiler made by Intel Corp.</br> +See, for example <code>org/eclipse/cdt/cmake/is/intel/IcpcToolDetectionParticipant.java</code>. diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/help_content_extension.xml b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/help_content_extension.xml index 89a0db52ea1..1510752d6de 100644 --- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/help_content_extension.xml +++ b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/help_content_extension.xml @@ -1,7 +1,7 @@ + path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_detection_participant_list"/> + path="/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/> \ No newline at end of file diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/help_content_extension.xml b/cmake/org.eclipse.cdt.cmake.is.intel/help_content_extension.xml index 854e96f8e44..e5867ed8de0 100644 --- a/cmake/org.eclipse.cdt.cmake.is.intel/help_content_extension.xml +++ b/cmake/org.eclipse.cdt.cmake.is.intel/help_content_extension.xml @@ -1,9 +1,9 @@ + path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_detection_participant_list"/> \ No newline at end of file diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/help_content_extension.xml b/cmake/org.eclipse.cdt.cmake.is.microsoft/help_content_extension.xml index be5a1403f94..b03323ef425 100644 --- a/cmake/org.eclipse.cdt.cmake.is.microsoft/help_content_extension.xml +++ b/cmake/org.eclipse.cdt.cmake.is.microsoft/help_content_extension.xml @@ -1,5 +1,5 @@ + path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_detection_participant_list"/> \ No newline at end of file diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/help_content_extension.xml b/cmake/org.eclipse.cdt.cmake.is.nvidia/help_content_extension.xml index a66b5e68118..d7af548b41a 100644 --- a/cmake/org.eclipse.cdt.cmake.is.nvidia/help_content_extension.xml +++ b/cmake/org.eclipse.cdt.cmake.is.nvidia/help_content_extension.xml @@ -1,9 +1,9 @@ + path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_detection_participant_list"/> + path="/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/> \ No newline at end of file