mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-08 02:06:01 +02:00
Bug 540978: Rename identifiers and some other places to o.e.cdt.lsp
Change-Id: I6edbbb2cf103010bbc67ea0140bfec694652a685
This commit is contained in:
parent
1c595b1187
commit
934fa19482
11 changed files with 26 additions and 26 deletions
|
@ -22,7 +22,7 @@ Export-Package: org.eclipse.cdt.internal.corext;x-internal:=true,
|
|||
org.eclipse.cdt.internal.ui.dialogs;x-internal:=true,
|
||||
org.eclipse.cdt.internal.ui.dialogs.cpaths;x-internal:=true,
|
||||
org.eclipse.cdt.internal.ui.dnd;x-internal:=true,
|
||||
org.eclipse.cdt.internal.ui.editor;x-friends:="org.eclipse.cdt.codan.ui,org.eclipse.cdt.codan.ui.cxx,org.eclipse.cdt.dsf.ui,org.eclipse.lsp4e.cpp.language",
|
||||
org.eclipse.cdt.internal.ui.editor;x-friends:="org.eclipse.cdt.codan.ui,org.eclipse.cdt.codan.ui.cxx,org.eclipse.cdt.dsf.ui,org.eclipse.cdt.lsp.core",
|
||||
org.eclipse.cdt.internal.ui.editor.asm;x-internal:=true,
|
||||
org.eclipse.cdt.internal.ui.filters;x-internal:=true,
|
||||
org.eclipse.cdt.internal.ui.help;x-internal:=true,
|
||||
|
@ -50,7 +50,7 @@ Export-Package: org.eclipse.cdt.internal.corext;x-internal:=true,
|
|||
org.eclipse.cdt.internal.ui.resources,
|
||||
org.eclipse.cdt.internal.ui.search;x-internal:=true,
|
||||
org.eclipse.cdt.internal.ui.search.actions;x-internal:=true,
|
||||
org.eclipse.cdt.internal.ui.text;x-friends:="org.eclipse.cdt.codan.ui.cxx,org.eclipse.cdt.dsf.ui,org.eclipse.lsp4e.cpp.language",
|
||||
org.eclipse.cdt.internal.ui.text;x-friends:="org.eclipse.cdt.codan.ui.cxx,org.eclipse.cdt.dsf.ui,org.eclipse.cdt.lsp.core",
|
||||
org.eclipse.cdt.internal.ui.text.asm;x-internal:=true,
|
||||
org.eclipse.cdt.internal.ui.text.c.hover;x-internal:=true,
|
||||
org.eclipse.cdt.internal.ui.text.contentassist;x-internal:=true,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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++
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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$
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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) {
|
||||
|
|
10
pom.xml
10
pom.xml
|
@ -399,7 +399,7 @@
|
|||
<cdt-ui.skip.tests>true</cdt-ui.skip.tests>
|
||||
<dsf-gdb.skip.tests>true</dsf-gdb.skip.tests>
|
||||
<cdt-other.skip.tests>true</cdt-other.skip.tests>
|
||||
<lsp4e-cpp.skip.tests>true</lsp4e-cpp.skip.tests>
|
||||
<lsp.skip.tests>true</lsp.skip.tests>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
|
@ -407,7 +407,7 @@
|
|||
<properties>
|
||||
<dsf-gdb.skip.tests>true</dsf-gdb.skip.tests>
|
||||
<cdt-other.skip.tests>true</cdt-other.skip.tests>
|
||||
<lsp4e-cpp.skip.tests>true</lsp4e-cpp.skip.tests>
|
||||
<lsp.skip.tests>true</lsp.skip.tests>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
|
@ -415,11 +415,11 @@
|
|||
<properties>
|
||||
<cdt-ui.skip.tests>true</cdt-ui.skip.tests>
|
||||
<cdt-other.skip.tests>true</cdt-other.skip.tests>
|
||||
<lsp4e-cpp.skip.tests>true</lsp4e-cpp.skip.tests>
|
||||
<lsp.skip.tests>true</lsp.skip.tests>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>skip-tests-except-lsp4e-cpp</id>
|
||||
<id>skip-tests-except-lsp</id>
|
||||
<properties>
|
||||
<cdt-ui.skip.tests>true</cdt-ui.skip.tests>
|
||||
<cdt-other.skip.tests>true</cdt-other.skip.tests>
|
||||
|
@ -431,7 +431,7 @@
|
|||
<properties>
|
||||
<cdt-ui.skip.tests>true</cdt-ui.skip.tests>
|
||||
<dsf-gdb.skip.tests>true</dsf-gdb.skip.tests>
|
||||
<lsp4e-cpp.skip.tests>true</lsp4e-cpp.skip.tests>
|
||||
<lsp.skip.tests>true</lsp.skip.tests>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
|
|
Loading…
Add table
Reference in a new issue