Skip to content

Commit fbbb846

Browse files
committed
some scratches for resolving
1 parent 641a5f7 commit fbbb846

107 files changed

Lines changed: 7489 additions & 147 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmake/src/main/java/consulo/cpp/cmake/CMakeCompileDataService.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717

1818
import consulo.annotation.component.ExtensionImpl;
1919
import consulo.cmake.externalSystem.model.CMakeCompileData;
20+
import consulo.cpp.cmake.module.CMakeCModuleExtension;
2021
import consulo.cpp.cmake.module.CMakeCMutableModuleExtension;
22+
import consulo.cpp.module.extension.CDefaultModuleExtension;
23+
import consulo.module.extension.MutableModuleExtension;
2124
import consulo.cpp.module.extension.CCompileSettings;
2225
import consulo.externalSystem.model.DataNode;
2326
import consulo.externalSystem.model.Key;
@@ -73,13 +76,23 @@ public void execute() {
7376
});
7477
}
7578

79+
/**
80+
* A module CMake imports has one framework, CMake, and C/C++ as its language: the CMake extension is enabled with the
81+
* C/C++ one under it, and the C/C++ set up by hand - another framework - is not.
82+
*/
7683
private static void apply(Module module, CCompileSettings settings) {
7784
ModifiableRootModel rootModel = ModuleRootManager.getInstance(module).getModifiableModel();
7885
CMakeCMutableModuleExtension extension = rootModel.getExtensionWithoutCheck(CMakeCMutableModuleExtension.class);
7986
if (extension == null) {
8087
rootModel.dispose();
8188
return;
8289
}
90+
if (rootModel.getExtensionWithoutCheck(CMakeCModuleExtension.PARENT_ID) instanceof MutableModuleExtension<?> cmake) {
91+
cmake.setEnabled(true);
92+
}
93+
if (rootModel.getExtensionWithoutCheck(CDefaultModuleExtension.ID) instanceof MutableModuleExtension<?> manual) {
94+
manual.setEnabled(false);
95+
}
8396
extension.setEnabled(true);
8497
extension.setCompileSettings(settings);
8598
rootModel.commit();

‎cmake/src/main/java/consulo/cpp/cmake/module/CMakeCModuleExtension.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@
3434
public class CMakeCModuleExtension extends ModuleExtensionBase<CMakeCModuleExtension> implements CModuleExtension<CMakeCModuleExtension> {
3535
public static final String ID = "cmake-cpp";
3636

37+
/**
38+
* The extension of the CMake plugin this one extends: the framework of the module, which C/C++ adds a language to.
39+
*/
40+
public static final String PARENT_ID = "CMAKE";
41+
3742
protected final CCompileSettings myCompileSettings = new CCompileSettings();
3843

3944
public CMakeCModuleExtension(String id, ModuleRootLayer rootLayer) {
@@ -50,6 +55,11 @@ public List<String> getIncludePaths() {
5055
return myCompileSettings.getIncludePaths();
5156
}
5257

58+
@Override
59+
public List<String> getForcedIncludes() {
60+
return myCompileSettings.getForcedIncludes();
61+
}
62+
5363
@Override
5464
public @Nullable CLanguageVersion getCStandard() {
5565
return myCompileSettings.getCStandard();

‎cmake/src/main/java/consulo/cpp/cmake/module/CMakeCModuleExtensionProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public String getId() {
4040

4141
@Override
4242
public @Nullable String getParentId() {
43-
return CDefaultModuleExtension.ID;
43+
return CMakeCModuleExtension.PARENT_ID;
4444
}
4545

4646
@Override

‎cmake/src/main/java/consulo/cpp/cmake/module/CMakeCMutableModuleExtension.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ public void setIncludePaths(List<String> includePaths) {
5151
myCompileSettings.setIncludePaths(includePaths);
5252
}
5353

54+
@Override
55+
public void setForcedIncludes(List<String> forcedIncludes) {
56+
myCompileSettings.setForcedIncludes(forcedIncludes);
57+
}
58+
5459
@Override
5560
public void setTarget(@Nullable String target) {
5661
myCompileSettings.setTarget(target);

‎cmake/src/main/resources/LOCALIZE-LIB/en_US/consulo.cpp.cmake.CMakeCLocalize.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
extension.name:
2-
text: C/C++ (CMake)
2+
text: C/C++
33
extension.defines.label:
44
text: 'Defines:'
55
extension.include.paths.label:
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
/*
2+
* Copyright 2013-2026 consulo.io
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package consulo.cpp.lang.editor.completion;
17+
18+
import consulo.annotation.access.RequiredReadAction;
19+
import consulo.annotation.component.ExtensionImpl;
20+
import consulo.cpp.lang.CLanguage;
21+
import consulo.cpp.lang.psi.CPsiTokens;
22+
import consulo.cpp.lang.psi.resolve.CCompletionVariants;
23+
import consulo.cpp.lang.psi.resolve.CDeclarationKind;
24+
import consulo.cpp.lang.psi.resolve.CDeclarations;
25+
import consulo.cpp.lang.psi.resolve.CType;
26+
import consulo.cpp.lang.psi.resolve.CTypes;
27+
import consulo.language.Language;
28+
import consulo.language.editor.completion.CompletionContributor;
29+
import consulo.language.editor.completion.CompletionParameters;
30+
import consulo.language.editor.completion.CompletionResultSet;
31+
import consulo.language.editor.completion.CompletionType;
32+
import consulo.language.editor.completion.lookup.LookupElementBuilder;
33+
import consulo.language.editor.completion.lookup.ParenthesesInsertHandler;
34+
import consulo.language.icon.IconDescriptorUpdaters;
35+
import consulo.language.pattern.StandardPatterns;
36+
import consulo.language.psi.PsiElement;
37+
38+
import java.util.List;
39+
40+
/**
41+
* Completes the names of C/C++ code - the variables, functions, types and namespaces a name there may be, the members
42+
* after {@code .}, {@code ->} and {@code ::} - from what resolve sees, see {@link CCompletionVariants}.
43+
*
44+
* @author VISTALL
45+
* @since 2026-11-02
46+
*/
47+
@ExtensionImpl
48+
public class CCompletionContributor extends CompletionContributor {
49+
public CCompletionContributor() {
50+
extend(CompletionType.BASIC, StandardPatterns.psiElement(CPsiTokens.IDENTIFIER).withLanguage(CLanguage.INSTANCE),
51+
(parameters, context, result) -> addVariants(parameters, result));
52+
}
53+
54+
@RequiredReadAction
55+
private static void addVariants(CompletionParameters parameters, CompletionResultSet result) {
56+
for (PsiElement declaration : CCompletionVariants.collect(parameters.getPosition())) {
57+
String name = CDeclarations.nameOf(declaration);
58+
if (name == null) {
59+
continue;
60+
}
61+
LookupElementBuilder lookup = LookupElementBuilder.create(declaration, name).withIcon(IconDescriptorUpdaters.getIcon(declaration, 0));
62+
CDeclarationKind kind = CDeclarations.kindOf(declaration);
63+
if (kind == CDeclarationKind.FUNCTION || kind == CDeclarationKind.VARIABLE) {
64+
CType type = CTypes.declaredType(declaration);
65+
if (!type.isUnknown()) {
66+
lookup = lookup.withTypeText(type.presentableText());
67+
}
68+
}
69+
if (kind == CDeclarationKind.FUNCTION) {
70+
List<PsiElement> functionParameters = CTypes.parametersOf(declaration);
71+
lookup = lookup.withTailText(parameterText(functionParameters), true)
72+
.withInsertHandler(ParenthesesInsertHandler.getInstance(!functionParameters.isEmpty()));
73+
}
74+
result.addElement(lookup);
75+
}
76+
}
77+
78+
private static String parameterText(List<PsiElement> parameters) {
79+
StringBuilder text = new StringBuilder("(");
80+
for (int i = 0; i < parameters.size(); i++) {
81+
text.append(i == 0 ? "" : ", ").append(parameters.get(i).getText());
82+
}
83+
return text.append(')').toString();
84+
}
85+
86+
@Override
87+
public Language getLanguage() {
88+
return CLanguage.INSTANCE;
89+
}
90+
}
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
/*
2+
* Copyright 2013-2026 consulo.io
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package consulo.cpp.lang.editor.findUsage;
17+
18+
import consulo.annotation.access.RequiredReadAction;
19+
import consulo.annotation.component.ExtensionImpl;
20+
import consulo.cpp.lang.CLanguage;
21+
import consulo.cpp.lang.psi.*;
22+
import consulo.cpp.lang.psi.resolve.CDeclarationKind;
23+
import consulo.cpp.lang.psi.resolve.CDeclarations;
24+
import consulo.cpp.lang.version.CLanguageVersions;
25+
import consulo.cpp.localize.CLocalize;
26+
import consulo.language.Language;
27+
import consulo.language.ast.TokenSet;
28+
import consulo.language.cacheBuilder.DefaultWordsScanner;
29+
import consulo.language.cacheBuilder.WordsScanner;
30+
import consulo.language.findUsage.FindUsagesProvider;
31+
import consulo.language.psi.PsiElement;
32+
import consulo.language.psi.PsiNamedElement;
33+
import org.jspecify.annotations.Nullable;
34+
35+
/**
36+
* Find usages of C/C++ declarations: the word index finds the files naming one, and the references there which
37+
* resolve to it are its usages. The words are those of the C++ lexer, so a name in a macro body or a directive counts
38+
* as a word too.
39+
*
40+
* @author VISTALL
41+
* @since 2026-11-02
42+
*/
43+
@ExtensionImpl
44+
public class CFindUsagesProvider implements FindUsagesProvider {
45+
@Override
46+
public @Nullable WordsScanner getWordsScanner() {
47+
return new DefaultWordsScanner(CLanguageVersions.getDefaultCpp().createLexer(), TokenSet.create(CPsiTokens.IDENTIFIER),
48+
CPsiTokens.COMMENT_SET, CPsiTokens.STRING_LITERAL_SET);
49+
}
50+
51+
@Override
52+
public boolean canFindUsagesFor(PsiElement element) {
53+
return element instanceof PsiNamedElement && CDeclarations.kindOf(element) != null && CDeclarations.nameIdentifier(element) != null;
54+
}
55+
56+
@Override
57+
public String getType(PsiElement element) {
58+
if (element instanceof CPsiParameter) {
59+
return CLocalize.parameter().get();
60+
}
61+
if (element instanceof CPsiLocalVariable) {
62+
return CLocalize.localVariable().get();
63+
}
64+
if (element instanceof CPsiEnumConstant) {
65+
return CLocalize.constant().get();
66+
}
67+
CDeclarationKind kind = CDeclarations.kindOf(element);
68+
if (kind == null) {
69+
return "";
70+
}
71+
return switch (kind) {
72+
case VARIABLE -> CDeclarations.enclosingAggregate(element) != null ? CLocalize.field().get() : CLocalize.globalVariable().get();
73+
case FUNCTION -> CDeclarations.isMemberFunction(element) ? CLocalize.memberFunction().get() : CLocalize.functionDeclaration().get();
74+
case TYPE -> CDeclarations.isTypeAlias(element) ? CLocalize.typeAlias().get() : CLocalize.className().get();
75+
case NAMESPACE -> CLocalize.namespaceName().get();
76+
};
77+
}
78+
79+
@RequiredReadAction
80+
@Override
81+
public String getDescriptiveName(PsiElement element) {
82+
String name = CDeclarations.nameOf(element);
83+
return name == null ? "" : name;
84+
}
85+
86+
@RequiredReadAction
87+
@Override
88+
public String getNodeText(PsiElement element, boolean useFullName) {
89+
return getDescriptiveName(element);
90+
}
91+
92+
@Override
93+
public Language getLanguage() {
94+
return CLanguage.INSTANCE;
95+
}
96+
}

0 commit comments

Comments
 (0)