Bug 559674: eliminate 'lsp' (language settings provider)
Change-Id: I8bcead6d09feefc6093cdd97349c26d563cd9f1f
Signed-off-by: Martin Weber <fifteenknots505@gmail.com>
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 89a0db5..1510752 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 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
\ 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 f9eb219..da10023 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 @@
<h3>Compilers supported through separate plug-ins</h3>
<!-- extra compilers go here -->
- <anchor id="extra_lsp_detection_participant_builtins_list"/>
+ <anchor id="extra_detection_participant_builtins_list"/>
<h2>Enhanced Built-ins Detection Support</h2>
<p>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 3ae21f5..85b5394 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 @@
</ul>
<h3>Compilers supported through separate plug-ins</h3>
<!-- extra compilers go here -->
- <anchor id="extra_lsp_detection_participant_list"/>
+ <anchor id="extra_detection_participant_list"/>
<h2>CMAKE_EXPORT_COMPILE_COMMANDS Compiler Built-ins</h2>
<p>This provider works similar to <q>CMAKE_EXPORT_COMPILE_COMMANDS Parser</q>, 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 6b1e002..f8755b0 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 @@
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 @@
<meta.section type="implementation"/>
</appinfo>
<documentation>
- 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>.
</documentation>
</annotation>
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 89a0db5..1510752 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 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
\ 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 854e96f..e5867ed 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 @@
<?xml version="1.0" encoding="UTF-8"?>
<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"/>
<!-- built-ins detection is not supported
<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>
\ 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 be5a140..b03323e 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 @@
<?xml version="1.0" encoding="UTF-8"?>
<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"/>
</contentExtension>
\ 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 a66b5e6..d7af548 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 @@
<?xml version="1.0" encoding="UTF-8"?>
<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"/>
<contribution content="doc/compiler.xhtml#builtins_enhanced"
path="/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_lsp_detection_participant_builtins_enhanced_list"/>
</contentExtension>
\ No newline at end of file
