diff options
Diffstat (limited to 'lsp')
9 files changed, 19 insertions, 19 deletions
diff --git a/lsp/org.eclipse.cdt.lsp.core.tests/META-INF/MANIFEST.MF b/lsp/org.eclipse.cdt.lsp.core.tests/META-INF/MANIFEST.MF index 9d2a4e9fd1b..cbb7ac89ed5 100644 --- a/lsp/org.eclipse.cdt.lsp.core.tests/META-INF/MANIFEST.MF +++ b/lsp/org.eclipse.cdt.lsp.core.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: "Tests for LSP4E C/C++ Support" Bundle-SymbolicName: org.eclipse.cdt.lsp.core.tests Bundle-Version: 1.0.0.qualifier -Automatic-Module-Name: org.eclipse.lsp4e.cpp.language.tests +Automatic-Module-Name: org.eclipse.cdt.lsp.core.tests Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.lsp4e, org.eclipse.lsp4j, diff --git a/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF b/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF index 85979c35a0b..f765fac8677 100644 --- a/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF +++ b/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF @@ -26,4 +26,4 @@ Bundle-Activator: org.eclipse.cdt.lsp.core.Activator Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.ui.editors.text, org.eclipse.ui.texteditor -Automatic-Module-Name: org.eclipse.lsp4e.cpp.language +Automatic-Module-Name: org.eclipse.cdt.lsp.core diff --git a/lsp/org.eclipse.cdt.lsp.core/OSGI-INF/l10n/bundle.properties b/lsp/org.eclipse.cdt.lsp.core/OSGI-INF/l10n/bundle.properties index 19675c4c963..2d9f4a01a44 100644 --- a/lsp/org.eclipse.cdt.lsp.core/OSGI-INF/l10n/bundle.properties +++ b/lsp/org.eclipse.cdt.lsp.core/OSGI-INF/l10n/bundle.properties @@ -1,4 +1,4 @@ -#Properties file for org.eclipse.lsp4e.cpp.language +#Properties file for org.eclipse.cdt.lsp.core Bundle-Vendor = Eclipse CDT Bundle-Name = LSP4E C/C++ Support Plug-in content-type.name = C/C++ diff --git a/lsp/org.eclipse.cdt.lsp.core/plugin.xml b/lsp/org.eclipse.cdt.lsp.core/plugin.xml index 717d395a306..71e437050e6 100644 --- a/lsp/org.eclipse.cdt.lsp.core/plugin.xml +++ b/lsp/org.eclipse.cdt.lsp.core/plugin.xml @@ -6,7 +6,7 @@ <content-type base-type="org.eclipse.core.runtime.text" file-extensions="cpp,c,h,cxx,cc,hxx,hpp" - id="org.eclipse.lsp4e.languages.cpp" + id="org.eclipse.cdt.lsp.core" name="%content-type.name" priority="normal"> </content-type> @@ -15,28 +15,28 @@ point="org.eclipse.lsp4e.languageServer"> <server class="org.eclipse.cdt.lsp.core.CPPStreamConnectionProvider" - id="org.eclipse.lsp4e.languages.cpp" + id="org.eclipse.cdt.lsp.core" label="%server.label" clientImpl="org.eclipse.cdt.lsp.core.Server2ClientProtocolExtension" > </server> <contentTypeMapping - contentType="org.eclipse.lsp4e.languages.cpp" - id="org.eclipse.lsp4e.languages.cpp"> + contentType="org.eclipse.cdt.lsp.core" + id="org.eclipse.cdt.lsp.core"> </contentTypeMapping> </extension> <extension - id="org.eclipse.lsp4e.cpp.language.CDocumentSetupParticipant" + id="org.eclipse.cdt.lsp.core.CDocumentSetupParticipant" name="%cDocumentSetupParticipant" point="org.eclipse.core.filebuffers.documentSetup"> <participant class="org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant" - contentTypeId="org.eclipse.lsp4e.languages.cpp"> + contentTypeId="org.eclipse.cdt.lsp.core"> </participant> </extension> <extension point="org.eclipse.ui.editors"> <editorContentTypeBinding - contentTypeId="org.eclipse.lsp4e.languages.cpp" + contentTypeId="org.eclipse.cdt.lsp.core" editorId="org.eclipse.ui.genericeditor.GenericEditor"> </editorContentTypeBinding> </extension> @@ -44,7 +44,7 @@ point="org.eclipse.ui.genericeditor.presentationReconcilers"> <presentationReconciler class="org.eclipse.cdt.lsp.core.PresentationReconcilerCPP" - contentType="org.eclipse.lsp4e.languages.cpp"> + contentType="org.eclipse.cdt.lsp.core"> </presentationReconciler> </extension> <extension @@ -52,7 +52,7 @@ <page class="org.eclipse.cdt.lsp.core.CPPLanguageServerPreferencePage" category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage" - id="org.eclipse.lsp4e.cpp.language.CPPLanguageServerPreferencePage" + id="org.eclipse.cdt.lsp.core.CPPLanguageServerPreferencePage" name="%PreferencePageTitle"> </page> </extension> @@ -66,7 +66,7 @@ point="org.eclipse.ui.genericeditor.autoEditStrategies"> <autoEditStrategy class="org.eclipse.cdt.lsp.core.AutoIndentStrategyCPP" - contentType="org.eclipse.lsp4e.languages.cpp"> + contentType="org.eclipse.cdt.lsp.core"> </autoEditStrategy> </extension> </plugin> diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Activator.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Activator.java index 176b76c877d..82e3149a670 100644 --- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Activator.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Activator.java @@ -21,7 +21,7 @@ public class Activator extends AbstractUIPlugin { public Activator() { } - public static final String PLUGIN_ID = "org.eclipse.lsp4e.cpp.language"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.cdt.lsp.core"; //$NON-NLS-1$ private static Activator plugin; diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPStreamConnectionProvider.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPStreamConnectionProvider.java index 0022609c3a6..87f0481ca87 100644 --- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPStreamConnectionProvider.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPStreamConnectionProvider.java @@ -30,7 +30,7 @@ import org.eclipse.lsp4e.server.ProcessStreamConnectionProvider; public class CPPStreamConnectionProvider extends ProcessStreamConnectionProvider { - public static final String ID = "org.eclipse.lsp4e.languages.cpp"; //$NON-NLS-1$ + public static final String ID = "org.eclipse.cdt.lsp.core"; //$NON-NLS-1$ private IResourceChangeListener fResourceListener; diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CqueryLanguageServer.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CqueryLanguageServer.java index 4f6940718f0..953a8f745a2 100644 --- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CqueryLanguageServer.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CqueryLanguageServer.java @@ -27,7 +27,7 @@ public class CqueryLanguageServer implements ICPPLanguageServer { // TODO: Allow user to specify cache directory path - IPath cacheDirectory = Path.fromOSString(rootPath.getPath()).append(".lsp4e-cpp/cquery_index"); //$NON-NLS-1$ + IPath cacheDirectory = Path.fromOSString(rootPath.getPath()).append(".cdt-lsp/cquery_index"); //$NON-NLS-1$ JsonObject result = (defaultInitOptions instanceof JsonObject) ? (JsonObject) defaultInitOptions : new JsonObject(); result.addProperty("cacheDirectory", cacheDirectory.toString()); //$NON-NLS-1$ diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PresentationReconcilerCPP.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PresentationReconcilerCPP.java index 4c1e6140c48..679a7f9ce8f 100644 --- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PresentationReconcilerCPP.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/PresentationReconcilerCPP.java @@ -83,8 +83,8 @@ public class PresentationReconcilerCPP extends CPresentationReconciler { private BracketInserter fBracketInserter; private DefaultPositionUpdater semanticHighlightingPositionUpdater; - public static final String SEMANTIC_HIGHLIGHTING_POSITION_CATEGORY = "org.eclipse.lsp4e.cpp.semanticHighlight"; //$NON-NLS-1$ - public static final String INACTIVE_CODE_HIGHLIGHTING_POSITION_CATEGORY = "org.eclipse.lsp4e.cpp.inactiveCodeHighlight"; //$NON-NLS-1$ + public static final String SEMANTIC_HIGHLIGHTING_POSITION_CATEGORY = "org.eclipse.cdt.lsp.core.semanticHighlight"; //$NON-NLS-1$ + public static final String INACTIVE_CODE_HIGHLIGHTING_POSITION_CATEGORY = "org.eclipse.cdt.lsp.core.inactiveCodeHighlight"; //$NON-NLS-1$ // A set containing all active objects of PresentationReconcilerCPP. public static Set<PresentationReconcilerCPP> presentationReconcilers = ConcurrentHashMap.newKeySet(); diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Server2ClientProtocolExtension.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Server2ClientProtocolExtension.java index 08b55705d79..2465e048ab5 100644 --- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Server2ClientProtocolExtension.java +++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Server2ClientProtocolExtension.java @@ -56,7 +56,7 @@ public class Server2ClientProtocolExtension extends LanguageClientImpl { Display.getDefault().asyncExec(new Runnable() { @Override public void run() { - final String cqueryStatusFieldId = "org.eclipse.lsp4e.cpp.status"; //$NON-NLS-1$ + final String cqueryStatusFieldId = "org.eclipse.cdt.lsp.core.status"; //$NON-NLS-1$ final int width = 28; IWorkbenchWindow[] workbenchWindows = PlatformUI.getWorkbench().getWorkbenchWindows(); for (IWorkbenchWindow window : workbenchWindows) { |