From afe7d1879386391a0d88ef2ff3f23c6d789c7287 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Fri, 9 Nov 2018 09:53:47 -0500 Subject: [PATCH] Bug 540978 Rename lsp plugins to be org.eclipse.cdt.lsp.* To make it clear these are CDT's future :). Change-Id: I64935e3998a46632f4f4006589a17eb01959eb27 --- .../org.eclipse.cdt.lsp-feature}/.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.core.runtime.prefs | 0 .../build.properties | 0 .../feature.properties | 0 .../org.eclipse.cdt.lsp-feature}/feature.xml | 4 +- .../.classpath | 0 .../org.eclipse.cdt.lsp.core.tests}/.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 4 +- .../build.properties | 0 .../org.eclipse.cdt.lsp.core.tests}/pom.xml | 11 +- .../tests/cquery/CqueryJsonParseTest.java | 6 +- .../org.eclipse.cdt.lsp.core}/.classpath | 0 .../org.eclipse.cdt.lsp.core}/.gitignore | 0 .../org.eclipse.cdt.lsp.core}/.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.core.runtime.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.pde.prefs | 0 .../META-INF/MANIFEST.MF | 8 +- .../OSGI-INF/l10n/bundle.properties | 0 .../build.properties | 0 .../org.eclipse.cdt.lsp.core}/plugin.xml | 12 +- .../org/eclipse/cdt/lsp/core}/Activator.java | 2 +- .../cdt/lsp/core}/AutoIndentStrategyCPP.java | 2 +- .../CPPLanguageServerPreferencePage.java | 2 +- .../lsp/core}/CPPResourceChangeListener.java | 234 +++++++++--------- .../core}/CPPStreamConnectionProvider.java | 2 +- .../cdt/lsp/core}/ClangdLanguageServer.java | 2 +- .../cdt/lsp/core}/CqueryLanguageServer.java | 2 +- .../cdt/lsp/core}/ICPPLanguageServer.java | 2 +- .../lsp/core}/LineBackgroundListenerCPP.java | 2 +- .../org/eclipse/cdt/lsp/core}/Messages.java | 2 +- .../eclipse/cdt/lsp/core}/Messages.properties | 0 .../cdt/lsp/core}/PreferenceConstants.java | 2 +- .../cdt/lsp/core}/PreferenceInitializer.java | 2 +- .../lsp/core}/PresentationReconcilerCPP.java | 2 +- .../core}/Server2ClientProtocolExtension.java | 10 +- .../core}/cquery/CqueryInactiveRegions.java | 2 +- .../cquery/CquerySemanticHighlights.java | 2 +- .../lsp/core}/cquery/CquerySymbolKind.java | 2 +- .../core}/cquery/ExtendedSymbolKindType.java | 2 +- .../cdt/lsp/core}/cquery/HighlightSymbol.java | 2 +- .../core}/cquery/IndexingProgressStats.java | 2 +- .../cdt/lsp/core}/cquery/StorageClass.java | 2 +- lsp/pom.xml | 15 ++ lsp4e-cpp/.mvn/extensions.xml | 9 - lsp4e-cpp/LICENSE | 203 --------------- lsp4e-cpp/README.md | 29 --- lsp4e-cpp/org.eclipse.lsp4e.cpp.site/.project | 11 - .../org.eclipse.lsp4e.cpp.site/category.xml | 13 - lsp4e-cpp/org.eclipse.lsp4e.cpp.site/pom.xml | 29 --- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.core.runtime.prefs | 2 - lsp4e-cpp/pom.xml | 22 -- pom.xml | 7 +- 58 files changed, 183 insertions(+), 492 deletions(-) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp => lsp/org.eclipse.cdt.lsp-feature}/.project (89%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language => lsp/org.eclipse.cdt.lsp-feature}/.settings/org.eclipse.core.resources.prefs (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language => lsp/org.eclipse.cdt.lsp-feature}/.settings/org.eclipse.core.runtime.prefs (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp => lsp/org.eclipse.cdt.lsp-feature}/build.properties (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp => lsp/org.eclipse.cdt.lsp-feature}/feature.properties (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp => lsp/org.eclipse.cdt.lsp-feature}/feature.xml (86%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests => lsp/org.eclipse.cdt.lsp.core.tests}/.classpath (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language => lsp/org.eclipse.cdt.lsp.core.tests}/.project (93%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests => lsp/org.eclipse.cdt.lsp.core.tests}/.settings/org.eclipse.jdt.core.prefs (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests => lsp/org.eclipse.cdt.lsp.core.tests}/META-INF/MANIFEST.MF (80%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests => lsp/org.eclipse.cdt.lsp.core.tests}/build.properties (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests => lsp/org.eclipse.cdt.lsp.core.tests}/pom.xml (82%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core.tests/src/org/eclipse/cdt/lsp/core}/tests/cquery/CqueryJsonParseTest.java (96%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language => lsp/org.eclipse.cdt.lsp.core}/.classpath (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language => lsp/org.eclipse.cdt.lsp.core}/.gitignore (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests => lsp/org.eclipse.cdt.lsp.core}/.project (92%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.site => lsp/org.eclipse.cdt.lsp.core}/.settings/org.eclipse.core.resources.prefs (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.site => lsp/org.eclipse.cdt.lsp.core}/.settings/org.eclipse.core.runtime.prefs (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language => lsp/org.eclipse.cdt.lsp.core}/.settings/org.eclipse.jdt.core.prefs (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language => lsp/org.eclipse.cdt.lsp.core}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language => lsp/org.eclipse.cdt.lsp.core}/.settings/org.eclipse.pde.prefs (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language => lsp/org.eclipse.cdt.lsp.core}/META-INF/MANIFEST.MF (78%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language => lsp/org.eclipse.cdt.lsp.core}/OSGI-INF/l10n/bundle.properties (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language => lsp/org.eclipse.cdt.lsp.core}/build.properties (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language => lsp/org.eclipse.cdt.lsp.core}/plugin.xml (82%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/Activator.java (97%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/AutoIndentStrategyCPP.java (96%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/CPPLanguageServerPreferencePage.java (98%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/CPPResourceChangeListener.java (96%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/CPPStreamConnectionProvider.java (99%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/ClangdLanguageServer.java (94%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/CqueryLanguageServer.java (97%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/ICPPLanguageServer.java (94%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/LineBackgroundListenerCPP.java (98%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/Messages.java (95%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/Messages.properties (100%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/PreferenceConstants.java (95%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/PreferenceInitializer.java (96%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/PresentationReconcilerCPP.java (99%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/Server2ClientProtocolExtension.java (96%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/cquery/CqueryInactiveRegions.java (95%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/cquery/CquerySemanticHighlights.java (94%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/cquery/CquerySymbolKind.java (96%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/cquery/ExtendedSymbolKindType.java (97%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/cquery/HighlightSymbol.java (98%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/cquery/IndexingProgressStats.java (97%) rename {lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language => lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core}/cquery/StorageClass.java (95%) create mode 100644 lsp/pom.xml delete mode 100644 lsp4e-cpp/.mvn/extensions.xml delete mode 100644 lsp4e-cpp/LICENSE delete mode 100644 lsp4e-cpp/README.md delete mode 100644 lsp4e-cpp/org.eclipse.lsp4e.cpp.site/.project delete mode 100644 lsp4e-cpp/org.eclipse.lsp4e.cpp.site/category.xml delete mode 100644 lsp4e-cpp/org.eclipse.lsp4e.cpp.site/pom.xml delete mode 100644 lsp4e-cpp/org.eclipse.lsp4e.cpp/.settings/org.eclipse.core.resources.prefs delete mode 100644 lsp4e-cpp/org.eclipse.lsp4e.cpp/.settings/org.eclipse.core.runtime.prefs delete mode 100644 lsp4e-cpp/pom.xml diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp/.project b/lsp/org.eclipse.cdt.lsp-feature/.project similarity index 89% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp/.project rename to lsp/org.eclipse.cdt.lsp-feature/.project index 5763f0e6ddd..976f2116970 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp/.project +++ b/lsp/org.eclipse.cdt.lsp-feature/.project @@ -1,6 +1,6 @@ - org.eclipse.lsp4e.cpp + org.eclipse.cdt.lsp-feature diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.settings/org.eclipse.core.resources.prefs b/lsp/org.eclipse.cdt.lsp-feature/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.settings/org.eclipse.core.resources.prefs rename to lsp/org.eclipse.cdt.lsp-feature/.settings/org.eclipse.core.resources.prefs diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.settings/org.eclipse.core.runtime.prefs b/lsp/org.eclipse.cdt.lsp-feature/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.settings/org.eclipse.core.runtime.prefs rename to lsp/org.eclipse.cdt.lsp-feature/.settings/org.eclipse.core.runtime.prefs diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp/build.properties b/lsp/org.eclipse.cdt.lsp-feature/build.properties similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp/build.properties rename to lsp/org.eclipse.cdt.lsp-feature/build.properties diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp/feature.properties b/lsp/org.eclipse.cdt.lsp-feature/feature.properties similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp/feature.properties rename to lsp/org.eclipse.cdt.lsp-feature/feature.properties diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp/feature.xml b/lsp/org.eclipse.cdt.lsp-feature/feature.xml similarity index 86% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp/feature.xml rename to lsp/org.eclipse.cdt.lsp-feature/feature.xml index 681d3a9ad59..4ef4c89937a 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp/feature.xml +++ b/lsp/org.eclipse.cdt.lsp-feature/feature.xml @@ -1,6 +1,6 @@ diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/.classpath b/lsp/org.eclipse.cdt.lsp.core.tests/.classpath similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/.classpath rename to lsp/org.eclipse.cdt.lsp.core.tests/.classpath diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.project b/lsp/org.eclipse.cdt.lsp.core.tests/.project similarity index 93% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.project rename to lsp/org.eclipse.cdt.lsp.core.tests/.project index 801ab7b60c1..a93e06df0ce 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.project +++ b/lsp/org.eclipse.cdt.lsp.core.tests/.project @@ -1,6 +1,6 @@ - org.eclipse.lsp4e.cpp.language + org.eclipse.cdt.lsp.core.tests diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/.settings/org.eclipse.jdt.core.prefs b/lsp/org.eclipse.cdt.lsp.core.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/.settings/org.eclipse.jdt.core.prefs rename to lsp/org.eclipse.cdt.lsp.core.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/META-INF/MANIFEST.MF b/lsp/org.eclipse.cdt.lsp.core.tests/META-INF/MANIFEST.MF similarity index 80% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/META-INF/MANIFEST.MF rename to lsp/org.eclipse.cdt.lsp.core.tests/META-INF/MANIFEST.MF index 6df0060ac65..9d2a4e9fd1b 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/META-INF/MANIFEST.MF +++ b/lsp/org.eclipse.cdt.lsp.core.tests/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: "Tests for LSP4E C/C++ Support" -Bundle-SymbolicName: org.eclipse.lsp4e.cpp.language.tests +Bundle-SymbolicName: org.eclipse.cdt.lsp.core.tests Bundle-Version: 1.0.0.qualifier Automatic-Module-Name: org.eclipse.lsp4e.cpp.language.tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.lsp4e, org.eclipse.lsp4j, org.eclipse.lsp4j.jsonrpc, - org.eclipse.lsp4e.cpp.language, + org.eclipse.cdt.lsp.core, com.google.gson;bundle-version="2.8.2", org.junit diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/build.properties b/lsp/org.eclipse.cdt.lsp.core.tests/build.properties similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/build.properties rename to lsp/org.eclipse.cdt.lsp.core.tests/build.properties diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/pom.xml b/lsp/org.eclipse.cdt.lsp.core.tests/pom.xml similarity index 82% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/pom.xml rename to lsp/org.eclipse.cdt.lsp.core.tests/pom.xml index 1ae99f2f184..7a57fca02ce 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/pom.xml +++ b/lsp/org.eclipse.cdt.lsp.core.tests/pom.xml @@ -6,18 +6,15 @@ org.eclipse.cdt - org.eclipse.lsp4e.cpp-parent - 9.6.0-SNAPSHOT - ../pom.xml + cdt-parent + 9.6.0-SNAPSHOT + ../../pom.xml 1.0.0-SNAPSHOT - org.eclipse.lsp4e.cpp.language.tests + org.eclipse.cdt.lsp.core.tests eclipse-test-plugin - - ${lsp4e-cpp.skip.tests} - diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/src/org/eclipse/lsp4e/cpp/language/tests/cquery/CqueryJsonParseTest.java b/lsp/org.eclipse.cdt.lsp.core.tests/src/org/eclipse/cdt/lsp/core/tests/cquery/CqueryJsonParseTest.java similarity index 96% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/src/org/eclipse/lsp4e/cpp/language/tests/cquery/CqueryJsonParseTest.java rename to lsp/org.eclipse.cdt.lsp.core.tests/src/org/eclipse/cdt/lsp/core/tests/cquery/CqueryJsonParseTest.java index f0abdb53268..eb014dc01e5 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/src/org/eclipse/lsp4e/cpp/language/tests/cquery/CqueryJsonParseTest.java +++ b/lsp/org.eclipse.cdt.lsp.core.tests/src/org/eclipse/cdt/lsp/core/tests/cquery/CqueryJsonParseTest.java @@ -6,15 +6,15 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language.tests.cquery; +package org.eclipse.cdt.lsp.core.tests.cquery; import java.net.URI; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.eclipse.lsp4e.cpp.language.Server2ClientProtocolExtension; -import org.eclipse.lsp4e.cpp.language.cquery.*; +import org.eclipse.cdt.lsp.core.Server2ClientProtocolExtension; +import org.eclipse.cdt.lsp.core.cquery.*; import org.eclipse.lsp4j.Position; import org.eclipse.lsp4j.Range; import org.eclipse.lsp4j.jsonrpc.json.JsonRpcMethod; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.classpath b/lsp/org.eclipse.cdt.lsp.core/.classpath similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.classpath rename to lsp/org.eclipse.cdt.lsp.core/.classpath diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.gitignore b/lsp/org.eclipse.cdt.lsp.core/.gitignore similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.gitignore rename to lsp/org.eclipse.cdt.lsp.core/.gitignore diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/.project b/lsp/org.eclipse.cdt.lsp.core/.project similarity index 92% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/.project rename to lsp/org.eclipse.cdt.lsp.core/.project index 40593687885..2524436d04a 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/.project +++ b/lsp/org.eclipse.cdt.lsp.core/.project @@ -1,6 +1,6 @@ - org.eclipse.lsp4e.cpp.language.tests + org.eclipse.cdt.lsp.core diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/.settings/org.eclipse.core.resources.prefs b/lsp/org.eclipse.cdt.lsp.core/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.site/.settings/org.eclipse.core.resources.prefs rename to lsp/org.eclipse.cdt.lsp.core/.settings/org.eclipse.core.resources.prefs diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/.settings/org.eclipse.core.runtime.prefs b/lsp/org.eclipse.cdt.lsp.core/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.site/.settings/org.eclipse.core.runtime.prefs rename to lsp/org.eclipse.cdt.lsp.core/.settings/org.eclipse.core.runtime.prefs diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.settings/org.eclipse.jdt.core.prefs b/lsp/org.eclipse.cdt.lsp.core/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.settings/org.eclipse.jdt.core.prefs rename to lsp/org.eclipse.cdt.lsp.core/.settings/org.eclipse.jdt.core.prefs diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.settings/org.eclipse.jdt.ui.prefs b/lsp/org.eclipse.cdt.lsp.core/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.settings/org.eclipse.jdt.ui.prefs rename to lsp/org.eclipse.cdt.lsp.core/.settings/org.eclipse.jdt.ui.prefs diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.settings/org.eclipse.pde.prefs b/lsp/org.eclipse.cdt.lsp.core/.settings/org.eclipse.pde.prefs similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/.settings/org.eclipse.pde.prefs rename to lsp/org.eclipse.cdt.lsp.core/.settings/org.eclipse.pde.prefs diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/META-INF/MANIFEST.MF b/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF similarity index 78% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/META-INF/MANIFEST.MF rename to lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF index 3ebb1c5fe4b..85979c35a0b 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/META-INF/MANIFEST.MF +++ b/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name -Bundle-SymbolicName: org.eclipse.lsp4e.cpp.language;singleton:=true +Bundle-SymbolicName: org.eclipse.cdt.lsp.core;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.apache.commons.io, @@ -20,9 +20,9 @@ Require-Bundle: org.apache.commons.io, com.google.gson;bundle-version="2.8.2", org.eclipse.lsp4j.jsonrpc Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.lsp4e.cpp.language, - org.eclipse.lsp4e.cpp.language.cquery -Bundle-Activator: org.eclipse.lsp4e.cpp.language.Activator +Export-Package: org.eclipse.cdt.lsp.core, + org.eclipse.cdt.lsp.core.cquery +Bundle-Activator: org.eclipse.cdt.lsp.core.Activator Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.ui.editors.text, org.eclipse.ui.texteditor diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/OSGI-INF/l10n/bundle.properties b/lsp/org.eclipse.cdt.lsp.core/OSGI-INF/l10n/bundle.properties similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/OSGI-INF/l10n/bundle.properties rename to lsp/org.eclipse.cdt.lsp.core/OSGI-INF/l10n/bundle.properties diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/build.properties b/lsp/org.eclipse.cdt.lsp.core/build.properties similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/build.properties rename to lsp/org.eclipse.cdt.lsp.core/build.properties diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/plugin.xml b/lsp/org.eclipse.cdt.lsp.core/plugin.xml similarity index 82% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/plugin.xml rename to lsp/org.eclipse.cdt.lsp.core/plugin.xml index f81c0b3e9f4..717d395a306 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/plugin.xml +++ b/lsp/org.eclipse.cdt.lsp.core/plugin.xml @@ -14,10 +14,10 @@ + clientImpl="org.eclipse.cdt.lsp.core.Server2ClientProtocolExtension" > @@ -59,13 +59,13 @@ + class="org.eclipse.cdt.lsp.core.PreferenceInitializer"> diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/Activator.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Activator.java similarity index 97% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/Activator.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Activator.java index 2206de04bb8..46d6c189028 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/Activator.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Activator.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language; +package org.eclipse.cdt.lsp.core; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/AutoIndentStrategyCPP.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/AutoIndentStrategyCPP.java similarity index 96% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/AutoIndentStrategyCPP.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/AutoIndentStrategyCPP.java index 85ce0e58ad5..c375b9bf38d 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/AutoIndentStrategyCPP.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/AutoIndentStrategyCPP.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language; +package org.eclipse.cdt.lsp.core; import org.eclipse.cdt.internal.ui.text.CAutoIndentStrategy; import org.eclipse.cdt.ui.CUIPlugin; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/CPPLanguageServerPreferencePage.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPLanguageServerPreferencePage.java similarity index 98% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/CPPLanguageServerPreferencePage.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPLanguageServerPreferencePage.java index cdd7a0bdcae..baab3792325 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/CPPLanguageServerPreferencePage.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPLanguageServerPreferencePage.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language; +package org.eclipse.cdt.lsp.core; import java.io.File; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/CPPResourceChangeListener.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPResourceChangeListener.java similarity index 96% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/CPPResourceChangeListener.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPResourceChangeListener.java index a2dcda07346..8bf4da8e4f5 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/CPPResourceChangeListener.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPResourceChangeListener.java @@ -1,118 +1,118 @@ -/******************************************************************************* - * Copyright (c) 2017 Ericsson and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - *******************************************************************************/ - -package org.eclipse.lsp4e.cpp.language; - -import java.io.IOException; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResourceChangeEvent; -import org.eclipse.core.resources.IResourceChangeListener; -import org.eclipse.core.resources.IResourceDelta; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.lsp4e.LanguageServersRegistry; -import org.eclipse.lsp4e.LanguageServersRegistry.LanguageServerDefinition; -import org.eclipse.lsp4e.LanguageServiceAccessor; -import org.eclipse.lsp4e.ProjectSpecificLanguageServerWrapper; -import org.eclipse.lsp4j.DidChangeWatchedFilesParams; -import org.eclipse.lsp4j.FileChangeType; -import org.eclipse.lsp4j.FileEvent; - -/** - * A resource listener used to generate FileEvents, as part of the LSP. This - * only listens to Added, Changed, Removed event on a specific project that as a - * C/C++ language server started. - */ -@SuppressWarnings("restriction") -final class CPPResourceChangeListener implements IResourceChangeListener { - private final IProject fProject; - - CPPResourceChangeListener(IProject project) { - fProject = project; - } - - @Override - public void resourceChanged(IResourceChangeEvent event) { - LanguageServerDefinition definition = LanguageServersRegistry.getInstance().getDefinition(CPPStreamConnectionProvider.ID); - ProjectSpecificLanguageServerWrapper wrapper = getLanguageSeverWrapper(definition); - if (event.getType() != IResourceChangeEvent.POST_CHANGE || !isRelevantDelta(event.getDelta()) - || wrapper == null) { - return; - } - - sendFileEvents(wrapper, createFileEventsFromResourceEvent(event)); - } - - private static void sendFileEvents(ProjectSpecificLanguageServerWrapper wrapper, List fileEvents) { - if (!fileEvents.isEmpty()) { - DidChangeWatchedFilesParams params = new DidChangeWatchedFilesParams(fileEvents); - wrapper.getServer().getWorkspaceService().didChangeWatchedFiles(params); - } - } - - private static List createFileEventsFromResourceEvent(IResourceChangeEvent event) { - List fileEvents = new ArrayList<>(); - try { - event.getDelta().accept((delta) -> { - if (delta.getResource() instanceof IFile && isRelevantDelta(delta)) { - FileEvent fileEvent = createFileEventFromDelta(delta); - if (fileEvent != null) { - fileEvents.add(fileEvent); - } - } - return true; - }, false); - } catch (CoreException e) { - // Do nothing - } - return fileEvents; - } - - private ProjectSpecificLanguageServerWrapper getLanguageSeverWrapper(LanguageServerDefinition definition) { - try { - return LanguageServiceAccessor.getLSWrapperForConnection(fProject, definition); - } catch (IOException e) { - // Do nothing - return null; - } - } - - private static boolean isRelevantDelta(IResourceDelta delta) { - int kind = delta.getKind(); - int flags = delta.getFlags(); - if (delta.getResource() instanceof IFile && kind == IResourceDelta.CHANGED) { - return (flags & IResourceDelta.CONTENT) != 0; - } - - return kind == IResourceDelta.ADDED || kind == IResourceDelta.CHANGED || kind == IResourceDelta.REMOVED; - } - - private static FileEvent createFileEventFromDelta(IResourceDelta delta) { - URI locationURI = delta.getResource().getLocationURI(); - if (locationURI == null) { - return null; - } - - FileChangeType changeType = null; - if (delta.getKind() == IResourceDelta.ADDED) { - changeType = FileChangeType.Created; - } else if (delta.getKind() == IResourceDelta.CHANGED) { - changeType = FileChangeType.Changed; - } else if (delta.getKind() == IResourceDelta.REMOVED) { - changeType = FileChangeType.Deleted; - } else { - throw new IllegalStateException("Unsupported resource delta kind: " + delta.getKind()); //$NON-NLS-1$ - } - - return new FileEvent(locationURI.toString(), changeType); - } +/******************************************************************************* + * Copyright (c) 2017 Ericsson and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + *******************************************************************************/ + +package org.eclipse.cdt.lsp.core; + +import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResourceChangeEvent; +import org.eclipse.core.resources.IResourceChangeListener; +import org.eclipse.core.resources.IResourceDelta; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.lsp4e.LanguageServersRegistry; +import org.eclipse.lsp4e.LanguageServersRegistry.LanguageServerDefinition; +import org.eclipse.lsp4e.LanguageServiceAccessor; +import org.eclipse.lsp4e.ProjectSpecificLanguageServerWrapper; +import org.eclipse.lsp4j.DidChangeWatchedFilesParams; +import org.eclipse.lsp4j.FileChangeType; +import org.eclipse.lsp4j.FileEvent; + +/** + * A resource listener used to generate FileEvents, as part of the LSP. This + * only listens to Added, Changed, Removed event on a specific project that as a + * C/C++ language server started. + */ +@SuppressWarnings("restriction") +final class CPPResourceChangeListener implements IResourceChangeListener { + private final IProject fProject; + + CPPResourceChangeListener(IProject project) { + fProject = project; + } + + @Override + public void resourceChanged(IResourceChangeEvent event) { + LanguageServerDefinition definition = LanguageServersRegistry.getInstance().getDefinition(CPPStreamConnectionProvider.ID); + ProjectSpecificLanguageServerWrapper wrapper = getLanguageSeverWrapper(definition); + if (event.getType() != IResourceChangeEvent.POST_CHANGE || !isRelevantDelta(event.getDelta()) + || wrapper == null) { + return; + } + + sendFileEvents(wrapper, createFileEventsFromResourceEvent(event)); + } + + private static void sendFileEvents(ProjectSpecificLanguageServerWrapper wrapper, List fileEvents) { + if (!fileEvents.isEmpty()) { + DidChangeWatchedFilesParams params = new DidChangeWatchedFilesParams(fileEvents); + wrapper.getServer().getWorkspaceService().didChangeWatchedFiles(params); + } + } + + private static List createFileEventsFromResourceEvent(IResourceChangeEvent event) { + List fileEvents = new ArrayList<>(); + try { + event.getDelta().accept((delta) -> { + if (delta.getResource() instanceof IFile && isRelevantDelta(delta)) { + FileEvent fileEvent = createFileEventFromDelta(delta); + if (fileEvent != null) { + fileEvents.add(fileEvent); + } + } + return true; + }, false); + } catch (CoreException e) { + // Do nothing + } + return fileEvents; + } + + private ProjectSpecificLanguageServerWrapper getLanguageSeverWrapper(LanguageServerDefinition definition) { + try { + return LanguageServiceAccessor.getLSWrapperForConnection(fProject, definition); + } catch (IOException e) { + // Do nothing + return null; + } + } + + private static boolean isRelevantDelta(IResourceDelta delta) { + int kind = delta.getKind(); + int flags = delta.getFlags(); + if (delta.getResource() instanceof IFile && kind == IResourceDelta.CHANGED) { + return (flags & IResourceDelta.CONTENT) != 0; + } + + return kind == IResourceDelta.ADDED || kind == IResourceDelta.CHANGED || kind == IResourceDelta.REMOVED; + } + + private static FileEvent createFileEventFromDelta(IResourceDelta delta) { + URI locationURI = delta.getResource().getLocationURI(); + if (locationURI == null) { + return null; + } + + FileChangeType changeType = null; + if (delta.getKind() == IResourceDelta.ADDED) { + changeType = FileChangeType.Created; + } else if (delta.getKind() == IResourceDelta.CHANGED) { + changeType = FileChangeType.Changed; + } else if (delta.getKind() == IResourceDelta.REMOVED) { + changeType = FileChangeType.Deleted; + } else { + throw new IllegalStateException("Unsupported resource delta kind: " + delta.getKind()); //$NON-NLS-1$ + } + + return new FileEvent(locationURI.toString(), changeType); + } } \ No newline at end of file diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/CPPStreamConnectionProvider.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPStreamConnectionProvider.java similarity index 99% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/CPPStreamConnectionProvider.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPStreamConnectionProvider.java index d2b8d110c7c..5f787554322 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/CPPStreamConnectionProvider.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPStreamConnectionProvider.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language; +package org.eclipse.cdt.lsp.core; import java.io.BufferedReader; import java.io.File; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/ClangdLanguageServer.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/ClangdLanguageServer.java similarity index 94% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/ClangdLanguageServer.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/ClangdLanguageServer.java index 79c436f3c36..0ed9c9c3d30 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/ClangdLanguageServer.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/ClangdLanguageServer.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language; +package org.eclipse.cdt.lsp.core; import java.net.URI; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/CqueryLanguageServer.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CqueryLanguageServer.java similarity index 97% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/CqueryLanguageServer.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CqueryLanguageServer.java index a8977f83088..f594d0c5cf7 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/CqueryLanguageServer.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CqueryLanguageServer.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language; +package org.eclipse.cdt.lsp.core; import java.net.URI; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/ICPPLanguageServer.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/ICPPLanguageServer.java similarity index 94% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/ICPPLanguageServer.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/ICPPLanguageServer.java index 35d6a3eab33..82f3240d62a 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/ICPPLanguageServer.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/ICPPLanguageServer.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language; +package org.eclipse.cdt.lsp.core; import java.net.URI; /* diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/LineBackgroundListenerCPP.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/LineBackgroundListenerCPP.java similarity index 98% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/LineBackgroundListenerCPP.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/LineBackgroundListenerCPP.java index 387e15cedbd..c474c57fb63 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/LineBackgroundListenerCPP.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/LineBackgroundListenerCPP.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language; +package org.eclipse.cdt.lsp.core; import org.eclipse.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.ui.CUIPlugin; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/Messages.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Messages.java similarity index 95% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/Messages.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Messages.java index a7b2fb894c2..73f13be6931 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/Messages.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Messages.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language; +package org.eclipse.cdt.lsp.core; import org.eclipse.osgi.util.NLS; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/Messages.properties b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Messages.properties similarity index 100% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/Messages.properties rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Messages.properties diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PreferenceConstants.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PreferenceConstants.java similarity index 95% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PreferenceConstants.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PreferenceConstants.java index ec964848eda..0cd3a8a1a5a 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PreferenceConstants.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PreferenceConstants.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language; +package org.eclipse.cdt.lsp.core; /** * Constant definitions for LSP4E-CPP plug-in preferences. diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PreferenceInitializer.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PreferenceInitializer.java similarity index 96% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PreferenceInitializer.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PreferenceInitializer.java index c2dc5fc571a..cb4867de4dc 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PreferenceInitializer.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PreferenceInitializer.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language; +package org.eclipse.cdt.lsp.core; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.jface.preference.IPreferenceStore; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PresentationReconcilerCPP.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PresentationReconcilerCPP.java similarity index 99% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PresentationReconcilerCPP.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PresentationReconcilerCPP.java index e607c9d2700..d1b21daeefa 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PresentationReconcilerCPP.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PresentationReconcilerCPP.java @@ -15,7 +15,7 @@ * Manish Khurana *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language; +package org.eclipse.cdt.lsp.core; import java.net.URI; import java.util.ArrayList; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/Server2ClientProtocolExtension.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Server2ClientProtocolExtension.java similarity index 96% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/Server2ClientProtocolExtension.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Server2ClientProtocolExtension.java index 0a23ce75388..8dd2e30e0f2 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/Server2ClientProtocolExtension.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Server2ClientProtocolExtension.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language; +package org.eclipse.cdt.lsp.core; import java.net.URI; import java.util.ArrayList; @@ -14,6 +14,10 @@ import java.util.List; import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager.HighlightedPosition; import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager.HighlightingStyle; +import org.eclipse.cdt.lsp.core.cquery.CqueryInactiveRegions; +import org.eclipse.cdt.lsp.core.cquery.CquerySemanticHighlights; +import org.eclipse.cdt.lsp.core.cquery.HighlightSymbol; +import org.eclipse.cdt.lsp.core.cquery.IndexingProgressStats; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.core.resources.IFile; @@ -30,10 +34,6 @@ import org.eclipse.jface.text.TextAttribute; import org.eclipse.jface.text.TextPresentation; import org.eclipse.lsp4e.LSPEclipseUtils; import org.eclipse.lsp4e.LanguageClientImpl; -import org.eclipse.lsp4e.cpp.language.cquery.CqueryInactiveRegions; -import org.eclipse.lsp4e.cpp.language.cquery.CquerySemanticHighlights; -import org.eclipse.lsp4e.cpp.language.cquery.HighlightSymbol; -import org.eclipse.lsp4e.cpp.language.cquery.IndexingProgressStats; import org.eclipse.lsp4j.Range; import org.eclipse.lsp4j.jsonrpc.services.JsonNotification; import org.eclipse.osgi.util.NLS; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/CqueryInactiveRegions.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CqueryInactiveRegions.java similarity index 95% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/CqueryInactiveRegions.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CqueryInactiveRegions.java index 526179749c3..5479350b83d 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/CqueryInactiveRegions.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CqueryInactiveRegions.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language.cquery; +package org.eclipse.cdt.lsp.core.cquery; import java.net.URI; import java.util.List; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/CquerySemanticHighlights.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CquerySemanticHighlights.java similarity index 94% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/CquerySemanticHighlights.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CquerySemanticHighlights.java index 2917e9551cd..7ae932885db 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/CquerySemanticHighlights.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CquerySemanticHighlights.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language.cquery; +package org.eclipse.cdt.lsp.core.cquery; import java.net.URI; import java.util.List; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/CquerySymbolKind.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CquerySymbolKind.java similarity index 96% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/CquerySymbolKind.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CquerySymbolKind.java index bc25f37a8b6..b48ddf2a71d 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/CquerySymbolKind.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CquerySymbolKind.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language.cquery; +package org.eclipse.cdt.lsp.core.cquery; enum CquerySymbolKind { Unknown(0), TypeAlias(252), Parameter(253), StaticMethod(254), Macro(255); diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/ExtendedSymbolKindType.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/ExtendedSymbolKindType.java similarity index 97% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/ExtendedSymbolKindType.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/ExtendedSymbolKindType.java index 0632f26fc85..3107a7c3e18 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/ExtendedSymbolKindType.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/ExtendedSymbolKindType.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language.cquery; +package org.eclipse.cdt.lsp.core.cquery; import java.lang.reflect.Type; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/HighlightSymbol.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/HighlightSymbol.java similarity index 98% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/HighlightSymbol.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/HighlightSymbol.java index a78d30686ac..8db4131db0e 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/HighlightSymbol.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/HighlightSymbol.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language.cquery; +package org.eclipse.cdt.lsp.core.cquery; import java.util.HashMap; import java.util.List; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/IndexingProgressStats.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/IndexingProgressStats.java similarity index 97% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/IndexingProgressStats.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/IndexingProgressStats.java index 61688827fcb..bb99e305a5a 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/IndexingProgressStats.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/IndexingProgressStats.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language.cquery; +package org.eclipse.cdt.lsp.core.cquery; public class IndexingProgressStats { private int indexRequestCount; diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/StorageClass.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/StorageClass.java similarity index 95% rename from lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/StorageClass.java rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/StorageClass.java index ff3b885e1f9..26317990823 100644 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/cquery/StorageClass.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/StorageClass.java @@ -6,7 +6,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.lsp4e.cpp.language.cquery; +package org.eclipse.cdt.lsp.core.cquery; public enum StorageClass { Invalid(0), None(1), Extern(2), Static(3), PrivateExtern(4), Auto(5), Register(6); diff --git a/lsp/pom.xml b/lsp/pom.xml new file mode 100644 index 00000000000..88b372fa89c --- /dev/null +++ b/lsp/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + + + org.eclipse.cdt + cdt-parent + 9.6.0-SNAPSHOT + + + org.eclipse.cdt.lsp-parent + pom + diff --git a/lsp4e-cpp/.mvn/extensions.xml b/lsp4e-cpp/.mvn/extensions.xml deleted file mode 100644 index 5edfccde4d7..00000000000 --- a/lsp4e-cpp/.mvn/extensions.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - org.eclipse.tycho.extras - tycho-pomless - 1.0.0 - - - diff --git a/lsp4e-cpp/LICENSE b/lsp4e-cpp/LICENSE deleted file mode 100644 index f735bee0e8d..00000000000 --- a/lsp4e-cpp/LICENSE +++ /dev/null @@ -1,203 +0,0 @@ -Eclipse Public License - v 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC -LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM -CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - -a) in the case of the initial Contributor, the initial code and documentation - distributed under this Agreement, and -b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - - where such changes and/or additions to the Program originate from and are - distributed by that particular Contributor. A Contribution 'originates' - from a Contributor if it was added to the Program by such Contributor - itself or anyone acting on such Contributor's behalf. Contributions do not - include additions to the Program which: (i) are separate modules of - software distributed in conjunction with the Program under their own - license agreement, and (ii) are not derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents" mean patent claims licensable by a Contributor which are -necessarily infringed by the use or sale of its Contribution alone or when -combined with the Program. - -"Program" means the Contributions distributed in accordance with this -Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, -including all Contributors. - -2. GRANT OF RIGHTS - a) Subject to the terms of this Agreement, each Contributor hereby grants - Recipient a non-exclusive, worldwide, royalty-free copyright license to - reproduce, prepare derivative works of, publicly display, publicly - perform, distribute and sublicense the Contribution of such Contributor, - if any, and such derivative works, in source code and object code form. - b) Subject to the terms of this Agreement, each Contributor hereby grants - Recipient a non-exclusive, worldwide, royalty-free patent license under - Licensed Patents to make, use, sell, offer to sell, import and otherwise - transfer the Contribution of such Contributor, if any, in source code and - object code form. This patent license shall apply to the combination of - the Contribution and the Program if, at the time the Contribution is - added by the Contributor, such addition of the Contribution causes such - combination to be covered by the Licensed Patents. The patent license - shall not apply to any other combinations which include the Contribution. - No hardware per se is licensed hereunder. - c) Recipient understands that although each Contributor grants the licenses - to its Contributions set forth herein, no assurances are provided by any - Contributor that the Program does not infringe the patent or other - intellectual property rights of any other entity. Each Contributor - disclaims any liability to Recipient for claims brought by any other - entity based on infringement of intellectual property rights or - otherwise. As a condition to exercising the rights and licenses granted - hereunder, each Recipient hereby assumes sole responsibility to secure - any other intellectual property rights needed, if any. For example, if a - third party patent license is required to allow Recipient to distribute - the Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - d) Each Contributor represents that to its knowledge it has sufficient - copyright rights in its Contribution, if any, to grant the copyright - license set forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under -its own license agreement, provided that: - - a) it complies with the terms and conditions of this Agreement; and - b) its license agreement: - i) effectively disclaims on behalf of all Contributors all warranties - and conditions, express and implied, including warranties or - conditions of title and non-infringement, and implied warranties or - conditions of merchantability and fitness for a particular purpose; - ii) effectively excludes on behalf of all Contributors all liability for - damages, including direct, indirect, special, incidental and - consequential damages, such as lost profits; - iii) states that any provisions which differ from this Agreement are - offered by that Contributor alone and not by any other party; and - iv) states that source code for the Program is available from such - Contributor, and informs licensees how to obtain it in a reasonable - manner on or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - - a) it must be made available under this Agreement; and - b) a copy of this Agreement must be included with each copy of the Program. - Contributors may not remove or alter any copyright notices contained - within the Program. - -Each Contributor must identify itself as the originator of its Contribution, -if -any, in a manner that reasonably allows subsequent Recipients to identify the -originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with -respect to end users, business partners and the like. While this license is -intended to facilitate the commercial use of the Program, the Contributor who -includes the Program in a commercial product offering should do so in a manner -which does not create potential liability for other Contributors. Therefore, -if a Contributor includes the Program in a commercial product offering, such -Contributor ("Commercial Contributor") hereby agrees to defend and indemnify -every other Contributor ("Indemnified Contributor") against any losses, -damages and costs (collectively "Losses") arising from claims, lawsuits and -other legal actions brought by a third party against the Indemnified -Contributor to the extent caused by the acts or omissions of such Commercial -Contributor in connection with its distribution of the Program in a commercial -product offering. The obligations in this section do not apply to any claims -or Losses relating to any actual or alleged intellectual property -infringement. In order to qualify, an Indemnified Contributor must: -a) promptly notify the Commercial Contributor in writing of such claim, and -b) allow the Commercial Contributor to control, and cooperate with the -Commercial Contributor in, the defense and any related settlement -negotiations. The Indemnified Contributor may participate in any such claim at -its own expense. - -For example, a Contributor might include the Program in a commercial product -offering, Product X. That Contributor is then a Commercial Contributor. If -that Commercial Contributor then makes performance claims, or offers -warranties related to Product X, those performance claims and warranties are -such Commercial Contributor's responsibility alone. Under this section, the -Commercial Contributor would have to defend claims against the other -Contributors related to those performance claims and warranties, and if a -court requires any other Contributor to pay any damages as a result, the -Commercial Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR -IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, -NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each -Recipient is solely responsible for determining the appropriateness of using -and distributing the Program and assumes all risks associated with its -exercise of rights under this Agreement , including but not limited to the -risks and costs of program errors, compliance with applicable laws, damage to -or loss of data, programs or equipment, and unavailability or interruption of -operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY -CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION -LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE -EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY -OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of the -remainder of the terms of this Agreement, and without further action by the -parties hereto, such provision shall be reformed to the minimum extent -necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Program itself -(excluding combinations of the Program with other software or hardware) -infringes such Recipient's patent(s), then such Recipient's rights granted -under Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to -comply with any of the material terms or conditions of this Agreement and does -not cure such failure in a reasonable period of time after becoming aware of -such noncompliance. If all Recipient's rights under this Agreement terminate, -Recipient agrees to cease use and distribution of the Program as soon as -reasonably practicable. However, Recipient's obligations under this Agreement -and any licenses granted by Recipient relating to the Program shall continue -and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in -order to avoid inconsistency the Agreement is copyrighted and may only be -modified in the following manner. The Agreement Steward reserves the right to -publish new versions (including revisions) of this Agreement from time to -time. No one other than the Agreement Steward has the right to modify this -Agreement. The Eclipse Foundation is the initial Agreement Steward. The -Eclipse Foundation may assign the responsibility to serve as the Agreement -Steward to a suitable separate entity. Each new version of the Agreement will -be given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the -Agreement under which it was received. In addition, after a new version of the -Agreement is published, Contributor may elect to distribute the Program -(including its Contributions) under the new version. Except as expressly -stated in Sections 2(a) and 2(b) above, Recipient receives no rights or -licenses to the intellectual property of any Contributor under this Agreement, -whether expressly, by implication, estoppel or otherwise. All rights in the -Program not expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the -intellectual property laws of the United States of America. No party to this -Agreement will bring a legal action under this Agreement more than one year -after the cause of action arose. Each party waives its rights to a jury trial in -any resulting litigation. diff --git a/lsp4e-cpp/README.md b/lsp4e-cpp/README.md deleted file mode 100644 index 4cc96d74bd7..00000000000 --- a/lsp4e-cpp/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# LSP4E-CPP: C/C++ Language Server Support in Eclipse IDE - -Support for C/C++ edition in Eclipse IDE using the Language Server Protocol. Relies on Clangd and the Language Server Protocol. - -## Prerequisites - -You need `Clangd` working on CLI (visible in `PATH` environment variable). Since `Clangd` is very young, you will most likely need to compile it from source, see the [Clang documentation](http://clang.llvm.org/get_started.html) for more instructions. Make sure you you do checkout the `Clang extra Tools`. - -## Build from source - -### Requirements -* `Maven 3.3` or greater -* `Java 8` (make sure it is seen by Maven with ```mvn -version```) - -With the repository cloned, simply execute ```mvn clean package```. The p2 repository will be in ```$LSP4E_CPP_ROOT/org.eclipse.lsp4e.cpp.site/target/repository```. - -## Installation in Eclipse IDE - -Go to Help > Install new Software. Add the local repository ```$LSP4E_CPP_ROOT/org.eclipse.lsp4e.cpp.site/target/repository```. - -## Usage ## - -Once the plug-in is installed, right-click on a C/C++ source file and open with the `Generic Text Editor`. - -## Concept - -LSP4E-CPP uses the [lsp4e](https://projects.eclipse.org/projects/technology.lsp4e) project to integrate with [Clangd (part of Clang "extra" tools)](http://clang.llvm.org/extra/) with the goal to provide a rich C/C++ editor in the Eclipse IDE. - -Keep in mind that `Clangd` is very young and just getting started so not many features are functional at this moment. diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/.project b/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/.project deleted file mode 100644 index 46cd10b5a53..00000000000 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - org.eclipse.lsp4e.cpp.site - - - - - - - - diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/category.xml b/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/category.xml deleted file mode 100644 index 30e175a9bda..00000000000 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/category.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - Update site for LSP4E C/C++ Support. - - - - - - - - - diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/pom.xml b/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/pom.xml deleted file mode 100644 index b6596332034..00000000000 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.cdt - org.eclipse.lsp4e.cpp-parent - 9.6.0-SNAPSHOT - ../pom.xml - - - org.eclipse.lsp4e.cpp.site - eclipse-repository - - - org.eclipse.lsp4e.cpp.repo - - diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp/.settings/org.eclipse.core.resources.prefs b/lsp4e-cpp/org.eclipse.lsp4e.cpp/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp/.settings/org.eclipse.core.runtime.prefs b/lsp4e-cpp/org.eclipse.lsp4e.cpp/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22d2a7..00000000000 --- a/lsp4e-cpp/org.eclipse.lsp4e.cpp/.settings/org.eclipse.core.runtime.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -line.separator=\n diff --git a/lsp4e-cpp/pom.xml b/lsp4e-cpp/pom.xml deleted file mode 100644 index ed2f1e26c0b..00000000000 --- a/lsp4e-cpp/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - 4.0.0 - - - org.eclipse.cdt - cdt-parent - 9.6.0-SNAPSHOT - - - org.eclipse.lsp4e.cpp-parent - pom - diff --git a/pom.xml b/pom.xml index 85124e960cf..5a1044c008e 100644 --- a/pom.xml +++ b/pom.xml @@ -167,9 +167,8 @@ lrparser/org.eclipse.cdt.core.lrparser.feature lrparser/org.eclipse.cdt.core.lrparser.sdk.feature - lsp4e-cpp/org.eclipse.lsp4e.cpp - lsp4e-cpp/org.eclipse.lsp4e.cpp.language - lsp4e-cpp/org.eclipse.lsp4e.cpp.site + lsp/org.eclipse.cdt.lsp.core + lsp/org.eclipse.cdt.lsp-feature memory/org.eclipse.cdt.debug.ui.memory.memorybrowser memory/org.eclipse.cdt.debug.ui.memory.floatingpoint @@ -248,7 +247,7 @@ dsf-gdb/org.eclipse.cdt.tests.dsf.gdb dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests jtag/org.eclipse.cdt.debug.gdbjtag.core.tests - lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests + lsp/org.eclipse.cdt.lsp.core.tests qt/org.eclipse.cdt.qt.ui.tests testsrunner/org.eclipse.cdt.testsrunner.tests xlc/org.eclipse.cdt.errorparsers.xlc.tests