diff --git a/csharp-api/src/main/java/consulo/csharp/compiler/MSBaseDotNetCompilerOptionsBuilder.java b/csharp-api/src/main/java/consulo/csharp/compiler/MSBaseDotNetCompilerOptionsBuilder.java index cb7531b07..300ede243 100644 --- a/csharp-api/src/main/java/consulo/csharp/compiler/MSBaseDotNetCompilerOptionsBuilder.java +++ b/csharp-api/src/main/java/consulo/csharp/compiler/MSBaseDotNetCompilerOptionsBuilder.java @@ -106,6 +106,7 @@ else if (matcher.group(4).equals("warning")) { } @Override + @SuppressWarnings("SpellCheckingInspection") public GeneralCommandLine createCommandLine(Module module, Collection results, DotNetModuleExtension extension) throws Exception { if (myExecutable == null) { throw new DotNetCompileFailedException("C# compiler is not found"); diff --git a/csharp-base-impl/src/main/java/consulo/csharp/base/module/extension/CSharpConfigurationPanel.java b/csharp-base-impl/src/main/java/consulo/csharp/base/module/extension/CSharpConfigurationPanel.java index be0f4d4fd..023f7adcf 100644 --- a/csharp-base-impl/src/main/java/consulo/csharp/base/module/extension/CSharpConfigurationPanel.java +++ b/csharp-base-impl/src/main/java/consulo/csharp/base/module/extension/CSharpConfigurationPanel.java @@ -57,6 +57,7 @@ * @since 2014-07-31 */ public final class CSharpConfigurationPanel { + @SuppressWarnings("SpellCheckingInspection") private static final List COMPILE_LEVELS = List.of( "ISO-1", "ISO-2", diff --git a/csharp-doc-psi-impl/src/main/java/consulo/csharp/lang/doc/impl/CSharpDocBraceMatcher.java b/csharp-doc-psi-impl/src/main/java/consulo/csharp/lang/doc/impl/CSharpDocBraceMatcher.java index 039990d8b..70b507b63 100644 --- a/csharp-doc-psi-impl/src/main/java/consulo/csharp/lang/doc/impl/CSharpDocBraceMatcher.java +++ b/csharp-doc-psi-impl/src/main/java/consulo/csharp/lang/doc/impl/CSharpDocBraceMatcher.java @@ -125,7 +125,7 @@ public boolean isStrictTagMatching(final FileType fileType, final int braceGroup switch(braceGroupId) { case XML_TAG_TOKEN_GROUP: - // Other xml languages may have nonbalanced tag names + // Other xml languages may have non-balanced tag names return isStrictTagMatchingForFileType(fileType); default: diff --git a/csharp-doc-psi-impl/src/main/java/consulo/csharp/lang/doc/impl/validation/CSharpDocTagManager.java b/csharp-doc-psi-impl/src/main/java/consulo/csharp/lang/doc/impl/validation/CSharpDocTagManager.java index fecdb7796..3287f36b9 100644 --- a/csharp-doc-psi-impl/src/main/java/consulo/csharp/lang/doc/impl/validation/CSharpDocTagManager.java +++ b/csharp-doc-psi-impl/src/main/java/consulo/csharp/lang/doc/impl/validation/CSharpDocTagManager.java @@ -43,6 +43,7 @@ public static CSharpDocTagManager getInstance() private Map myTags = new HashMap(); + @SuppressWarnings("SpellCheckingInspection") public CSharpDocTagManager() { addTag(new CSharpDocTagInfo("c")); diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/CSharpLineMarkerProvider.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/CSharpLineMarkerProvider.java index b0be64ca9..890fedec3 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/CSharpLineMarkerProvider.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/CSharpLineMarkerProvider.java @@ -59,7 +59,7 @@ public class CSharpLineMarkerProvider implements LineMarkerProvider, DumbAware { OverrideTypeCollector.INSTANCE, new PartialTypeCollector(), HidingOrOverridingElementCollector.INSTANCE, - HidedOrOverridedElementCollector.INSTANCE, + HidedOrOverriddenElementCollector.INSTANCE, new RecursiveCallCollector() }; diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInsight/actions/expressionActions/lambda/DelegateToLambdaExpressionFix.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInsight/actions/expressionActions/lambda/DelegateToLambdaExpressionFix.java index cc650888e..db7e2e7fe 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInsight/actions/expressionActions/lambda/DelegateToLambdaExpressionFix.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInsight/actions/expressionActions/lambda/DelegateToLambdaExpressionFix.java @@ -112,8 +112,8 @@ public boolean isAvailable(Project project, Editor editor, PsiElement element) { return false; } if (node.getElementType() == CSharpTokens.DELEGATE_KEYWORD) { - CSharpDelegateExpressionImpl anonymMethodExpression = PsiTreeUtil.getParentOfType(element, CSharpDelegateExpressionImpl.class); - return anonymMethodExpression != null && anonymMethodExpression.toTypeRef(true) != DotNetTypeRef.ERROR_TYPE; + CSharpDelegateExpressionImpl anonymousMethodExpression = PsiTreeUtil.getParentOfType(element, CSharpDelegateExpressionImpl.class); + return anonymousMethodExpression != null && anonymousMethodExpression.toTypeRef(true) != DotNetTypeRef.ERROR_TYPE; } return false; } diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInsight/codeVision/CSharpInheritorsCodeVisionProvider.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInsight/codeVision/CSharpInheritorsCodeVisionProvider.java index 0010bfb48..16f108a78 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInsight/codeVision/CSharpInheritorsCodeVisionProvider.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInsight/codeVision/CSharpInheritorsCodeVisionProvider.java @@ -22,15 +22,13 @@ import consulo.application.util.CachedValuesManager; import consulo.codeEditor.Editor; import consulo.csharp.api.localize.CSharpLocalize; -import consulo.csharp.impl.ide.lineMarkerProvider.HidedOrOverridedElementCollector; +import consulo.csharp.impl.ide.lineMarkerProvider.HidedOrOverriddenElementCollector; import consulo.csharp.impl.ide.lineMarkerProvider.LineMarkerCollector; import consulo.csharp.impl.ide.lineMarkerProvider.OverrideTypeCollector; import consulo.csharp.lang.CSharpLanguage; -import consulo.csharp.lang.psi.CSharpConstructorDeclaration; import consulo.csharp.lang.psi.CSharpSimpleLikeMethodAsElement; import consulo.csharp.lang.psi.CSharpTypeDeclaration; import consulo.dotnet.psi.DotNetModifier; -import consulo.dotnet.psi.DotNetModifierListOwner; import consulo.dotnet.psi.DotNetVirtualImplementOwner; import consulo.language.editor.codeVision.CodeVisionRelativeOrdering; import consulo.language.editor.impl.codeVision.CodeVisionProviderBase; @@ -126,7 +124,7 @@ public void handleClick(Editor editor, PsiElement element, ComponentEvent eve collector = OverrideTypeCollector.INSTANCE; } else { - collector = HidedOrOverridedElementCollector.INSTANCE; + collector = HidedOrOverriddenElementCollector.INSTANCE; } collector.navigate(event, element); diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInsight/codeVision/CSharpTelescope.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInsight/codeVision/CSharpTelescope.java index 9687046a7..8a1ac29ee 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInsight/codeVision/CSharpTelescope.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInsight/codeVision/CSharpTelescope.java @@ -79,6 +79,6 @@ static int collectInheritingClasses(CSharpTypeDeclaration aClass) { } static int collectOverridingMethods(CSharpSimpleLikeMethodAsElement method) { - return OverrideUtil.collectOverridenMembers((DotNetVirtualImplementOwner) method).size(); + return OverrideUtil.collectOverriddenMembers((DotNetVirtualImplementOwner) method).size(); } } diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInsight/problems/CSharpLocationUtil.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInsight/problems/CSharpLocationUtil.java index cb7caca1c..687f645ed 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInsight/problems/CSharpLocationUtil.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeInsight/problems/CSharpLocationUtil.java @@ -43,7 +43,7 @@ public static boolean isValidLocation(Project project, @Nullable VirtualFile vir { if(virtualFile == null || virtualFile.getFileType() != CSharpFileType.INSTANCE) { - // if not virtual file - we dont need break highlight + // if not virtual file - we don't need to break highlight return true; } diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeStyle/CSharpCodeStyleConfigurable.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeStyle/CSharpCodeStyleConfigurable.java index bb61db1e3..06da2c5dd 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeStyle/CSharpCodeStyleConfigurable.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeStyle/CSharpCodeStyleConfigurable.java @@ -39,6 +39,7 @@ protected CodeStyleAbstractPanel createPanel(CodeStyleSettings settings) } @Override + @SuppressWarnings("SpellCheckingInspection") public String getHelpTopic() { return "reference.settingsdialog.codestyle.csharp"; diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeStyle/CSharpLanguageCodeStyleSettingsProvider.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeStyle/CSharpLanguageCodeStyleSettingsProvider.java index f32df204f..78a82d7d0 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeStyle/CSharpLanguageCodeStyleSettingsProvider.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/codeStyle/CSharpLanguageCodeStyleSettingsProvider.java @@ -90,7 +90,7 @@ public void customizeSettings(CodeStyleSettingsCustomizable consumer, SettingsTy consumer.showCustomOption(CSharpCodeStyleSettings.class, "SPACE_BEFORE_PROPERTY_LBRACE", "Property left brace", CodeStyleSettingsCustomizable.SPACES_BEFORE_LEFT_BRACE, CodeStyleSettingsCustomizable.OptionAnchor.AFTER, "SPACE_BEFORE_METHOD_LBRACE"); - consumer.showCustomOption(CSharpCodeStyleSettings.class, "SPACE_BEFORE_INDEX_METHOD_LBRACE", "Index methd left brace", CodeStyleSettingsCustomizable.SPACES_BEFORE_LEFT_BRACE, + consumer.showCustomOption(CSharpCodeStyleSettings.class, "SPACE_BEFORE_INDEX_METHOD_LBRACE", "Index method left brace", CodeStyleSettingsCustomizable.SPACES_BEFORE_LEFT_BRACE, CodeStyleSettingsCustomizable.OptionAnchor.AFTER, "SPACE_BEFORE_METHOD_LBRACE"); consumer.showCustomOption(CSharpCodeStyleSettings.class, "SPACE_BEFORE_FOREACH_LBRACE", "'foreach' left brace", CodeStyleSettingsCustomizable.SPACES_BEFORE_LEFT_BRACE, diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/CSharpExpressionCompletionContributor.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/CSharpExpressionCompletionContributor.java index 78ce4da3f..804c99af0 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/CSharpExpressionCompletionContributor.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/CSharpExpressionCompletionContributor.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package consulo.csharp.impl.ide.completion; import consulo.annotation.access.RequiredReadAction; @@ -28,7 +27,7 @@ import consulo.csharp.impl.ide.completion.item.CSharpTypeLikeLookupElement; import consulo.csharp.impl.ide.completion.patterns.CSharpPatterns; import consulo.csharp.impl.ide.completion.util.SpaceInsertHandler; -import consulo.csharp.impl.ide.completion.weigher.CSharpInheritCompletionWeighter; +import consulo.csharp.impl.ide.completion.weigher.CSharpInheritCompletionWeigher; import consulo.csharp.lang.impl.ide.codeStyle.CSharpCodeGenerationSettings; import consulo.csharp.lang.impl.psi.CSharpContextUtil; import consulo.csharp.lang.impl.psi.CSharpTokenSets; @@ -75,7 +74,7 @@ /** * @author VISTALL - * @since 23.11.14 + * @since 2014-11-23 */ class CSharpExpressionCompletionContributor { @@ -180,7 +179,7 @@ public boolean test(IElementType elementType) @RequiredReadAction public void addCompletions(CompletionParameters parameters, ProcessingContext context, CompletionResultSet result) { - List expectedTypeInfos = CSharpInheritCompletionWeighter.getExpectedTypeInfosForExpression(parameters, context); + List expectedTypeInfos = CSharpInheritCompletionWeigher.getExpectedTypeInfosForExpression(parameters, context); for(ExpectedTypeInfo expectedTypeInfo : expectedTypeInfos) { @@ -319,7 +318,7 @@ public void addCompletions(final CompletionParameters parameters, ProcessingCont final CSharpTypeDeclaration contextType = getContextType(expression); - final List expectedTypeRefs = CSharpInheritCompletionWeighter.getExpectedTypeInfosForExpression(parameters, context); + final List expectedTypeRefs = CSharpInheritCompletionWeigher.getExpectedTypeInfosForExpression(parameters, context); for(ExpectedTypeInfo expectedTypeRef : expectedTypeRefs) { PsiElement element = expectedTypeRef.getTypeRef().resolve().getElement(); @@ -608,7 +607,7 @@ public void addCompletions(final CompletionParameters completionParameters, Proc DotNetType type = PsiTreeUtil.getParentOfType(parent, DotNetType.class); if(type != null) { - // disable native type completion, due they dont extends System.Exception + // disable native type completion, because they don't extend System.Exception if(type.getParent() instanceof CSharpLocalVariable && type.getParent().getParent() instanceof CSharpCatchStatementImpl) { return; diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/CSharpKeywordCompletionContributor.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/CSharpKeywordCompletionContributor.java index aae31617a..be41574de 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/CSharpKeywordCompletionContributor.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/CSharpKeywordCompletionContributor.java @@ -31,7 +31,7 @@ import consulo.language.editor.completion.CompletionProvider; import consulo.csharp.impl.ide.completion.patterns.CSharpPatterns; import consulo.csharp.impl.ide.completion.util.SpaceInsertHandler; -import consulo.csharp.lang.impl.psi.CSharpPreprocesorTokens; +import consulo.csharp.lang.impl.psi.CSharpPreprocessorTokens; import consulo.csharp.lang.impl.psi.CSharpPreprocessorElements; import consulo.csharp.lang.impl.psi.CSharpTokenSets; import consulo.csharp.lang.psi.*; @@ -86,7 +86,7 @@ static void extend(CompletionContributor contributor) CSharpCompletionUtil.tokenSetToLookup(result, THIS_OR_BASE, (b, elementType) -> b.withInsertHandler(ParenthesesInsertHandler.getInstance(true)), null); }); - contributor.extend(CompletionType.BASIC, psiElement(CSharpPreprocesorTokens.ILLEGAL_KEYWORD), new CompletionProvider() + contributor.extend(CompletionType.BASIC, psiElement(CSharpPreprocessorTokens.ILLEGAL_KEYWORD), new CompletionProvider() { @RequiredReadAction @Override @@ -238,7 +238,7 @@ public void addCompletions(final CompletionParameters parameters, ProcessingCont PsiElement parent1 = position.getParent().getParent(); - // dont allow inside statements + // Don't allow inside statements DotNetStatement statementParent = PsiTreeUtil.getParentOfType(parent1, DotNetStatement.class); if(statementParent != null) { diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/CSharpSuggestInstanceCompletionContributor.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/CSharpSuggestInstanceCompletionContributor.java index 0e43ffb76..8627d2091 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/CSharpSuggestInstanceCompletionContributor.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/CSharpSuggestInstanceCompletionContributor.java @@ -26,7 +26,7 @@ import consulo.csharp.impl.ide.completion.insertHandler.CSharpParenthesesWithSemicolonInsertHandler; import consulo.csharp.impl.ide.completion.patterns.CSharpPatterns; import consulo.csharp.impl.ide.completion.util.SpaceInsertHandler; -import consulo.csharp.impl.ide.completion.weigher.CSharpInheritCompletionWeighter; +import consulo.csharp.impl.ide.completion.weigher.CSharpInheritCompletionWeigher; import consulo.csharp.impl.ide.refactoring.util.CSharpNameSuggesterUtil; import consulo.csharp.lang.CSharpLanguage; import consulo.csharp.lang.impl.ide.codeStyle.CSharpCodeGenerationSettings; @@ -97,7 +97,7 @@ public void addCompletions(CompletionParameters parameters, ProcessingContext co } boolean allowAsync = CSharpModuleUtil.findLanguageVersion(parent).isAtLeast(CSharpLanguageVersion._4_0); - List expectedTypeRefs = CSharpInheritCompletionWeighter.getExpectedTypeInfosForExpression(parameters, context); + List expectedTypeRefs = CSharpInheritCompletionWeigher.getExpectedTypeInfosForExpression(parameters, context); for(ExpectedTypeInfo expectedTypeRef : expectedTypeRefs) { DotNetTypeRef typeRef = expectedTypeRef.getTypeRef(); @@ -120,12 +120,17 @@ public void addCompletions(CompletionParameters parameters, ProcessingContext co addDelegateExpressionLookup((CSharpLambdaResolveResult) typeResolveResult, result, parent, true); } - addPrivatMethodImpl((CSharpLambdaResolveResult) typeResolveResult, parameters, result, parent); + addPrivateMethodImpl((CSharpLambdaResolveResult) typeResolveResult, parameters, result, parent); } } } - private void addPrivatMethodImpl(CSharpLambdaResolveResult typeResolveResult, CompletionParameters parameters, CompletionResultSet result, CSharpReferenceExpressionEx parent) + private void addPrivateMethodImpl( + CSharpLambdaResolveResult typeResolveResult, + CompletionParameters parameters, + CompletionResultSet result, + CSharpReferenceExpressionEx parent + ) { PsiElement maybeAssign = parent.getParent(); if(!(maybeAssign instanceof CSharpAssignmentExpressionImpl)) diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/util/CSharpParenthesesInsertHandler.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/util/CSharpParenthesesInsertHandler.java index 1196e99b7..76f3c78c0 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/util/CSharpParenthesesInsertHandler.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/util/CSharpParenthesesInsertHandler.java @@ -76,18 +76,18 @@ public void handleInsert(final InsertionContext context, final LookupElement ite if(isToken(element, "(")) { - int lparenthOffset = element.getTextRange().getStartOffset(); + int lParenthOffset = element.getTextRange().getStartOffset(); if(completionChar == '(' || completionChar == '\t') { - editor.getCaretModel().moveToOffset(lparenthOffset + 1); + editor.getCaretModel().moveToOffset(lParenthOffset + 1); } else { editor.getCaretModel().moveToOffset(context.getTailOffset()); } - context.setTailOffset(lparenthOffset + 1); + context.setTailOffset(lParenthOffset + 1); PsiElement list = element.getParent(); PsiElement last = list.getLastChild(); @@ -97,7 +97,7 @@ public void handleInsert(final InsertionContext context, final LookupElement ite context.setTailOffset(rparenthOffset + 1); if(!putCaretInside) { - for(int i = lparenthOffset + 1; i < rparenthOffset; i++) + for(int i = lParenthOffset + 1; i < rparenthOffset; i++) { if(!Character.isWhitespace(document.getCharsSequence().charAt(i))) { @@ -110,7 +110,7 @@ public void handleInsert(final InsertionContext context, final LookupElement ite { AutoPopupController.getInstance(context.getProject()).autoPopupParameterInfo(editor, CSharpParameterInfoHandler.item(myLikeMethodDeclaration)); - editor.getCaretModel().moveToOffset(lparenthOffset + 1); + editor.getCaretModel().moveToOffset(lParenthOffset + 1); } return; } diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/weigher/CSharpInheritCompletionWeighter.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/weigher/CSharpInheritCompletionWeigher.java similarity index 96% rename from csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/weigher/CSharpInheritCompletionWeighter.java rename to csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/weigher/CSharpInheritCompletionWeigher.java index b35fa7f88..61e214287 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/weigher/CSharpInheritCompletionWeighter.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/completion/weigher/CSharpInheritCompletionWeigher.java @@ -52,10 +52,10 @@ /** * @author VISTALL - * @since 27.07.2015 + * @since 2015-07-27 */ @ExtensionImpl(order = "before stats, before csharpKindSorter") -public class CSharpInheritCompletionWeighter extends CompletionWeigher +public class CSharpInheritCompletionWeigher extends CompletionWeigher { public enum Position { @@ -65,8 +65,10 @@ public enum Position HIGH } - private static final NotNullLazyKey, CompletionLocation> ourExpectedInfoTypes = NotNullLazyKey.create("ourExpectedInfoTypes", it -> getExpectedTypeInfosForExpression(it - .getCompletionParameters().getPosition(), null)); + private static final NotNullLazyKey, CompletionLocation> ourExpectedInfoTypes = NotNullLazyKey.create( + "ourExpectedInfoTypes", + it -> getExpectedTypeInfosForExpression(it.getCompletionParameters().getPosition(), null) + ); @RequiredReadAction @@ -165,7 +167,7 @@ public Comparable weighElement(PsiElement psiElement, List expectedTypeRefs, Position upPosition) { - // if we have not type declaration, make types lower, dont allow int i = Int32 completion more high + // If we have no type declaration, make types lower, don't allow int i = Int32 completion more high if(referenceExpressionEx.kind() != CSharpReferenceExpression.ResolveToKind.TYPE_LIKE && CSharpCompletionUtil.isTypeLikeElementWithNamespace(psiElement) && upPosition == Position.UP_REF) { return Position.DOWN; diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/debugger/CSharpDebuggerSourceLineResolver.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/debugger/CSharpDebuggerSourceLineResolver.java index 8b13eb3f6..37b11dcce 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/debugger/CSharpDebuggerSourceLineResolver.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/debugger/CSharpDebuggerSourceLineResolver.java @@ -44,7 +44,7 @@ public Set getAllExecutableChildren(PsiElement root) root.accept(new CSharpRecursiveElementVisitor() { @Override - public void visitAnonymMethodExpression(CSharpDelegateExpressionImpl method) + public void visitAnonymousMethodExpression(CSharpDelegateExpressionImpl method) { lambdas.add(method); } diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/debugger/expressionEvaluator/PrefixOperatorEvaluator.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/debugger/expressionEvaluator/PrefixOperatorEvaluator.java index 3068e9dfb..b4b7ac7f6 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/debugger/expressionEvaluator/PrefixOperatorEvaluator.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/debugger/expressionEvaluator/PrefixOperatorEvaluator.java @@ -56,7 +56,7 @@ public void evaluate(CSharpEvaluateContext context) } else { - throw new IllegalArgumentException("dont supported '!' with not bool value"); + throw new IllegalArgumentException("'!' with no bool value is not supported"); } } else diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/findUsage/referenceSearch/CSharpImplementedReferenceSearch.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/findUsage/referenceSearch/CSharpImplementedReferenceSearch.java index fcbc8989a..1251606ba 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/findUsage/referenceSearch/CSharpImplementedReferenceSearch.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/findUsage/referenceSearch/CSharpImplementedReferenceSearch.java @@ -45,7 +45,7 @@ public void processQuery(ReferencesSearch.SearchParameters queryParameters, Pred if (elementToSearch instanceof CSharpMethodDeclaration) { Collection targets = ApplicationManager.getApplication().runReadAction((Supplier>) () -> { if (((CSharpMethodDeclaration) elementToSearch).hasModifier(DotNetModifier.ABSTRACT)) { - return OverrideUtil.collectOverridenMembers((DotNetVirtualImplementOwner) elementToSearch); + return OverrideUtil.collectOverriddenMembers((DotNetVirtualImplementOwner) elementToSearch); } return Collections.emptyList(); }); diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/CSharpColorSettingsPage.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/CSharpColorSettingsPage.java index 4a2b18ba8..497830704 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/CSharpColorSettingsPage.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/CSharpColorSettingsPage.java @@ -47,9 +47,9 @@ public class CSharpColorSettingsPage implements ColorSettingsPage private static final AttributesDescriptor[] ourDescriptors = new AttributesDescriptor[]{ new AttributesDescriptor("Comments//Block comment", CSharpHighlightKey.BLOCK_COMMENT), new AttributesDescriptor("Comments//Line comment", CSharpHighlightKey.LINE_COMMENT), - new AttributesDescriptor("Keywods//Keyword", CSharpHighlightKey.KEYWORD), - new AttributesDescriptor("Keywods//Context keyword", CSharpHighlightKey.SOFT_KEYWORD), - new AttributesDescriptor("Keywods//Preprocessor keyword", CSharpHighlightKey.MACRO_KEYWORD), + new AttributesDescriptor("Keywords//Keyword", CSharpHighlightKey.KEYWORD), + new AttributesDescriptor("Keywords//Context keyword", CSharpHighlightKey.SOFT_KEYWORD), + new AttributesDescriptor("Keywords//Preprocessor keyword", CSharpHighlightKey.MACRO_KEYWORD), new AttributesDescriptor("Preprocessor//Preprocessor variable", CSharpHighlightKey.MACRO_VARIABLE), new AttributesDescriptor("Preprocessor//Disabled preprocessor block", CSharpHighlightKey.DISABLED_BLOCK), new AttributesDescriptor("String", CSharpHighlightKey.STRING), @@ -57,7 +57,7 @@ public class CSharpColorSettingsPage implements ColorSettingsPage new AttributesDescriptor("Classes and Interfaces//Class name", CSharpHighlightKey.CLASS_NAME), new AttributesDescriptor("Classes and Interfaces//Attribute name", CSharpHighlightKey.ATTRIBUTE_NAME), new AttributesDescriptor("Classes and Interfaces//Enum name", CSharpHighlightKey.ENUM_NAME), - new AttributesDescriptor("Classes and Interfaces//Inteface name", CSharpHighlightKey.INTERFACE_NAME), + new AttributesDescriptor("Classes and Interfaces//Interface name", CSharpHighlightKey.INTERFACE_NAME), new AttributesDescriptor("Classes and Interfaces//Struct name", CSharpHighlightKey.STRUCT_NAME), new AttributesDescriptor("Methods//Constructor declaration", CSharpHighlightKey.CONSTRUCTOR_NAME), new AttributesDescriptor("Methods//Method declaration", CSharpHighlightKey.METHOD_NAME), @@ -66,13 +66,13 @@ public class CSharpColorSettingsPage implements ColorSettingsPage new AttributesDescriptor("Methods//Static method call", CSharpHighlightKey.STATIC_METHOD_CALL), new AttributesDescriptor("Methods//Instance method call", CSharpHighlightKey.INSTANCE_METHOD_CALL), new AttributesDescriptor("Methods//Method reference", CSharpHighlightKey.METHOD_REF), - new AttributesDescriptor("Class Fieds & Properties & Events//Instance field", CSharpHighlightKey.INSTANCE_FIELD), - new AttributesDescriptor("Class Fieds & Properties & Events//Static field", CSharpHighlightKey.STATIC_FIELD), - new AttributesDescriptor("Class Fieds & Properties & Events//Instance property", CSharpHighlightKey.INSTANCE_PROPERTY), - new AttributesDescriptor("Class Fieds & Properties & Events//Static property", CSharpHighlightKey.STATIC_PROPERTY), - new AttributesDescriptor("Class Fieds & Properties & Events//Static event", CSharpHighlightKey.STATIC_EVENT), - new AttributesDescriptor("Class Fieds & Properties & Events//Instance event", CSharpHighlightKey.INSTANCE_EVENT), - new AttributesDescriptor("Class Fieds & Properties & Events//Constant", CSharpHighlightKey.CONSTANT), + new AttributesDescriptor("Class Fields & Properties & Events//Instance field", CSharpHighlightKey.INSTANCE_FIELD), + new AttributesDescriptor("Class Fields & Properties & Events//Static field", CSharpHighlightKey.STATIC_FIELD), + new AttributesDescriptor("Class Fields & Properties & Events//Instance property", CSharpHighlightKey.INSTANCE_PROPERTY), + new AttributesDescriptor("Class Fields & Properties & Events//Static property", CSharpHighlightKey.STATIC_PROPERTY), + new AttributesDescriptor("Class Fields & Properties & Events//Static event", CSharpHighlightKey.STATIC_EVENT), + new AttributesDescriptor("Class Fields & Properties & Events//Instance event", CSharpHighlightKey.INSTANCE_EVENT), + new AttributesDescriptor("Class Fields & Properties & Events//Constant", CSharpHighlightKey.CONSTANT), new AttributesDescriptor("Parameters//Generic parameter name", CSharpHighlightKey.GENERIC_PARAMETER_NAME), new AttributesDescriptor("Parameters//Parameter", CSharpHighlightKey.PARAMETER), new AttributesDescriptor("Implicit or explicit cast", CSharpHighlightKey.IMPLICIT_OR_EXPLICIT_CAST), diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/CSharpPreprocessorSyntaxHighlighter.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/CSharpPreprocessorSyntaxHighlighter.java index c6a85bb27..8817b4389 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/CSharpPreprocessorSyntaxHighlighter.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/CSharpPreprocessorSyntaxHighlighter.java @@ -19,7 +19,7 @@ import consulo.colorScheme.TextAttributesKey; import consulo.csharp.editor.highlight.CSharpHighlightKey; import consulo.csharp.lang.impl.lexer.CSharpPreprocessorHightlightLexer; -import consulo.csharp.lang.impl.psi.CSharpPreprocesorTokens; +import consulo.csharp.lang.impl.psi.CSharpPreprocessorTokens; import consulo.language.ast.IElementType; import consulo.language.editor.highlight.SyntaxHighlighterBase; import consulo.language.lexer.Lexer; @@ -37,19 +37,19 @@ public class CSharpPreprocessorSyntaxHighlighter extends SyntaxHighlighterBase static { - safeMap(ourKeys, CSharpPreprocesorTokens.MACRO_DEFINE_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); - safeMap(ourKeys, CSharpPreprocesorTokens.MACRO_UNDEF_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); - safeMap(ourKeys, CSharpPreprocesorTokens.MACRO_IF_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); - safeMap(ourKeys, CSharpPreprocesorTokens.MACRO_ELSE_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); - safeMap(ourKeys, CSharpPreprocesorTokens.MACRO_ELIF_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); - safeMap(ourKeys, CSharpPreprocesorTokens.MACRO_REGION_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); - safeMap(ourKeys, CSharpPreprocesorTokens.MACRO_ENDIF_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); - safeMap(ourKeys, CSharpPreprocesorTokens.MACRO_ENDREGION_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); - safeMap(ourKeys, CSharpPreprocesorTokens.PRAGMA_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); - safeMap(ourKeys, CSharpPreprocesorTokens.WARNING_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); - safeMap(ourKeys, CSharpPreprocesorTokens.NULLABLE_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); - safeMap(ourKeys, CSharpPreprocesorTokens.ERROR_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); - //FIXME [VISTALL] highlight bug safeMap(ourKeys, CSharpPreprocesorTokens.LINE_COMMENT, CSharpHighlightKey.LINE_COMMENT); + safeMap(ourKeys, CSharpPreprocessorTokens.MACRO_DEFINE_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); + safeMap(ourKeys, CSharpPreprocessorTokens.MACRO_UNDEF_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); + safeMap(ourKeys, CSharpPreprocessorTokens.MACRO_IF_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); + safeMap(ourKeys, CSharpPreprocessorTokens.MACRO_ELSE_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); + safeMap(ourKeys, CSharpPreprocessorTokens.MACRO_ELIF_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); + safeMap(ourKeys, CSharpPreprocessorTokens.MACRO_REGION_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); + safeMap(ourKeys, CSharpPreprocessorTokens.MACRO_ENDIF_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); + safeMap(ourKeys, CSharpPreprocessorTokens.MACRO_ENDREGION_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); + safeMap(ourKeys, CSharpPreprocessorTokens.PRAGMA_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); + safeMap(ourKeys, CSharpPreprocessorTokens.WARNING_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); + safeMap(ourKeys, CSharpPreprocessorTokens.NULLABLE_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); + safeMap(ourKeys, CSharpPreprocessorTokens.ERROR_KEYWORD, CSharpHighlightKey.MACRO_KEYWORD); + //FIXME [VISTALL] highlight bug safeMap(ourKeys, CSharpPreprocessorTokens.LINE_COMMENT, CSharpHighlightKey.LINE_COMMENT); } @Override diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/CSharpCompilerChecks.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/CSharpCompilerChecks.java index eef86a9ae..a9ef98a21 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/CSharpCompilerChecks.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/CSharpCompilerChecks.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package consulo.csharp.impl.ide.highlight.check; import consulo.annotation.access.RequiredReadAction; @@ -30,13 +29,13 @@ /** * @author VISTALL - * @since 15.05.14 + * @since 2014-05-15 */ public enum CSharpCompilerChecks { CS0017(CSharpLanguageVersion._1_0, HighlightInfoType.ERROR), // Main() duplicate check CS0019(CSharpLanguageVersion._1_0, HighlightInfoType.ERROR), // operator checks CS0023(CSharpLanguageVersion._1_0, HighlightInfoType.ERROR), // null cant be reference qualifier(dot operator) - CS0026(CSharpLanguageVersion._1_0, HighlightInfoType.WRONG_REF), // 'this' dont exists in static context + CS0026(CSharpLanguageVersion._1_0, HighlightInfoType.WRONG_REF), // 'this' doesn't exist in static context CS0027(CSharpLanguageVersion._1_0, HighlightInfoType.WRONG_REF), // this can't used inside field declaration CS0029(CSharpLanguageVersion._1_0, HighlightInfoType.ERROR), // cant convert A to B with implicit CS0030(CSharpLanguageVersion._1_0, HighlightInfoType.ERROR), // cant convert A to B @@ -83,7 +82,7 @@ public enum CSharpCompilerChecks { CS0409(CSharpLanguageVersion._2_0, HighlightInfoType.ERROR), // generic constraint already defined for generic CS0413(CSharpLanguageVersion._2_0, HighlightInfoType.ERROR), // 'S' operator cant use to generic without class constraint, or reference CS0418(CSharpLanguageVersion._1_0, HighlightInfoType.WRONG_REF), // abstract type cant be static or sealed - CS0441(CSharpLanguageVersion._2_0, HighlightInfoType.WRONG_REF), // static and sealed cant be combinded + CS0441(CSharpLanguageVersion._2_0, HighlightInfoType.WRONG_REF), // static and sealed cant be combined CS0449(CSharpLanguageVersion._2_0, HighlightInfoType.ERROR), // struct or class constraint must be first CS0453(CSharpLanguageVersion._1_0, HighlightInfoType.ERROR), // nullable type required notnull type CS0500(CSharpLanguageVersion._1_0, HighlightInfoType.ERROR), // code block with abstract modifier @@ -95,8 +94,8 @@ public enum CSharpCompilerChecks { //CS0535(CSharpLanguageVersion._1_0, HighlightInfoType.ERROR), // checks for missed impl of abstract members CS0539(CSharpLanguageVersion._1_0, HighlightInfoType.WRONG_REF), // checks for private impl of abstract methods CS0542(CSharpLanguageVersion._1_0, HighlightInfoType.ERROR), // members cant be named as parent - CS0555(CSharpLanguageVersion._1_0, HighlightInfoType.ERROR), // implict and explicit cant convert to itself - CS0556(CSharpLanguageVersion._1_0, HighlightInfoType.ERROR), // implict and explicit cant be hold type without owner + CS0555(CSharpLanguageVersion._1_0, HighlightInfoType.ERROR), // implicit and explicit cant convert to itself + CS0556(CSharpLanguageVersion._1_0, HighlightInfoType.ERROR), // implicit and explicit cant be hold type without owner CS0568(CSharpLanguageVersion._1_0, HighlightInfoType.ERROR), // structs cant have parameterless constructor CS0673(CSharpLanguageVersion._1_0, HighlightInfoType.ERROR), // Void cant be used in C# CS0692(CSharpLanguageVersion._2_0, HighlightInfoType.ERROR), // duplicate parameter name @@ -140,7 +139,7 @@ public enum CSharpCompilerChecks { CS1980(CSharpLanguageVersion._1_0, HighlightInfoType.WRONG_REF), // dynamic checks CS1984(CSharpLanguageVersion._4_0, HighlightInfoType.WRONG_REF), // await cant be used inside finally statements CS1985(CSharpLanguageVersion._4_0, HighlightInfoType.WRONG_REF), // await cant be used inside catch statements - CS1998(CSharpLanguageVersion._4_0, CSharpHighlightInfoType::getUnusedDeclaration), // async modifer - then no await + CS1998(CSharpLanguageVersion._4_0, CSharpHighlightInfoType::getUnusedDeclaration), // async modifier - then no await CS4009(CSharpLanguageVersion._4_0, HighlightInfoType.WRONG_REF), // async modifier cant be at entry point CS8632(CSharpLanguageVersion._8_0, HighlightInfoType.WARNING), // nullable type check diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CC0001.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CC0001.java index 755e1cdd9..cb3d6788c 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CC0001.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CC0001.java @@ -141,7 +141,7 @@ else if (callElement instanceof CSharpMethodCallExpressionImpl call result.withHighlightInfoType(insideDoc ? HighlightInfoType.WEAK_WARNING : HighlightInfoType.WRONG_REF); String unresolvedText = getUnresolvedText(callElement, range); - if (isCalleInsideCalle(callElement)) { + if (isNestedCall(callElement)) { result.withText(LocalizeValue.localizeTODO("Expression cant be invoked")); // remap to error, due we want make all exp red result.withHighlightInfoType(insideDoc ? HighlightInfoType.WEAK_WARNING : HighlightInfoType.ERROR); @@ -168,7 +168,7 @@ else if (callElement instanceof CSharpMethodCallExpressionImpl call @Contract("null -> false") @RequiredReadAction - public static boolean isCalleInsideCalle(@Nullable PsiElement callElement) { + public static boolean isNestedCall(@Nullable PsiElement callElement) { return callElement instanceof CSharpMethodCallExpressionImpl call && !(call.getCallExpression() instanceof CSharpReferenceExpression); } diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CC0004.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CC0004.java index fe36b084a..6896697d9 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CC0004.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CC0004.java @@ -40,7 +40,7 @@ public class CC0004 extends CompilerCheck public List check(CSharpLanguageVersion languageVersion, CSharpHighlightContext highlightContext, CSharpMethodCallExpressionImpl element) { List list = new ArrayList<>(); - if(CC0001.isCalleInsideCalle(element)) + if(CC0001.isNestedCall(element)) { DotNetExpression callExpression = element.getCallExpression(); list.add(callExpression); diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS0029.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS0029.java index e34b44013..3d24b1e86 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS0029.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS0029.java @@ -98,9 +98,9 @@ private void check() } } - private static final String[] ourNewArrayLenghtTypes = new String[]{ + private static final String[] ourNewArrayLengthTypes = new String[]{ DotNetTypes.System.Int32, - // set int32 as default type for new array lenght + // set int32 as default type for new array length DotNetTypes.System.Byte, DotNetTypes.System.SByte, DotNetTypes.System.Int16, @@ -425,9 +425,9 @@ else if(element instanceof CSharpReturnStatementImpl) CheckTarget target = new CheckTarget(); target.target(element); target.actual(((DotNetExpression) element).toTypeRef(true)); - for(String newArrayLenghtType : ourNewArrayLenghtTypes) + for(String newArrayLengthType : ourNewArrayLengthTypes) { - target.expect(new CSharpTypeRefByQName(element, newArrayLenghtType)); + target.expect(new CSharpTypeRefByQName(element, newArrayLengthType)); } return target; } diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS0107.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS0107.java index a81530956..4646f1356 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS0107.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS0107.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package consulo.csharp.impl.ide.highlight.check.impl; import java.util.ArrayList; @@ -35,7 +34,7 @@ /** * @author VISTALL - * @since 10.06.14 + * @since 2014-06-10 */ public class CS0107 extends CompilerCheck { @@ -95,7 +94,7 @@ private static void collectModifierElements(CSharpAccessModifier accessModifier, map.put(modifier, modifierElement); } } - // dont return array if size of elements if not equal tokens + // Don't return array if size of elements is not equal to tokens if(modifiers.length != map.size()) { return; diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS0201.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS0201.java index 742199ac6..613bfc5dc 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS0201.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS0201.java @@ -58,7 +58,7 @@ public HighlightInfoFactory checkImpl(CSharpLanguageVersion languageVersion, CSh if(expression instanceof CSharpNewExpression) { - // anonym object dont reported as illegal + // Anonymous object isn't reported as illegal if(((CSharpNewExpression) expression).getFieldOrPropertySetBlock() != null) { return null; diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS0214.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS0214.java index 3c4dea3c6..32fed740d 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS0214.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS0214.java @@ -123,7 +123,7 @@ private static Pair isAllowedUnsafeCode(PsiEle DotNetQualifiedElement qualifiedElement = PsiTreeUtil.getParentOfType(element, DotNetQualifiedElement.class); if(!(qualifiedElement instanceof DotNetModifierListOwner)) { - // dont interest if we dont have parent - how it can be? + // Not interested if there is no parent - how can that happen? return Pair.create(Boolean.TRUE, null); } diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS1547.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS1547.java index 03f2d4fbc..0cfb0c470 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS1547.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/highlight/check/impl/CS1547.java @@ -71,7 +71,7 @@ public HighlightInfoFactory checkImpl(CSharpLanguageVersion languageVersion, CSh } PsiElement lastChild = parent.getLastChild(); - // dont show error while typing + // Don't show error while typing if(lastChild instanceof PsiErrorElement) { return null; diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/lineMarkerProvider/HidedOrOverridedElementCollector.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/lineMarkerProvider/HidedOrOverriddenElementCollector.java similarity index 90% rename from csharp-impl/src/main/java/consulo/csharp/impl/ide/lineMarkerProvider/HidedOrOverridedElementCollector.java rename to csharp-impl/src/main/java/consulo/csharp/impl/ide/lineMarkerProvider/HidedOrOverriddenElementCollector.java index fb821d544..30aecf3a6 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/lineMarkerProvider/HidedOrOverridedElementCollector.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/lineMarkerProvider/HidedOrOverriddenElementCollector.java @@ -39,25 +39,25 @@ /** * @author VISTALL - * @since 15.12.14 + * @since 2014-12-15 */ -public class HidedOrOverridedElementCollector implements LineMarkerCollector { +public class HidedOrOverriddenElementCollector implements LineMarkerCollector { private static class OurHandler implements GutterIconNavigationHandler { public static final OurHandler INSTANCE = new OurHandler(); @Override @RequiredUIAccess public void navigate(ComponentEvent event, PsiElement element) { - CSharpLineMarkerUtil.openTargets(event, element.getProject(), "Searching for overrided", CSharpLineMarkerUtil.BY_PARENT, () -> { + CSharpLineMarkerUtil.openTargets(event, element.getProject(), "Searching for overrides", CSharpLineMarkerUtil.BY_PARENT, () -> { DotNetVirtualImplementOwner virtualImplementOwner = element instanceof DotNetVirtualImplementOwner v ? v : CSharpLineMarkerUtil.findElementForLineMarker(element); - return virtualImplementOwner == null ? List.of() : OverrideUtil.collectOverridenMembers(virtualImplementOwner); + return virtualImplementOwner == null ? List.of() : OverrideUtil.collectOverriddenMembers(virtualImplementOwner); }); } } - public static final HidedOrOverridedElementCollector INSTANCE = new HidedOrOverridedElementCollector(); + public static final HidedOrOverriddenElementCollector INSTANCE = new HidedOrOverriddenElementCollector(); @Override @RequiredUIAccess @@ -75,7 +75,7 @@ public void collect(PsiElement psiElement, Consumer consumer) { return; } - Collection overrideElements = OverrideUtil.collectOverridenMembers(virtualImplementOwner); + Collection overrideElements = OverrideUtil.collectOverriddenMembers(virtualImplementOwner); if (overrideElements.isEmpty()) { return; @@ -110,7 +110,7 @@ else if (abstractMe) { icon = AllIcons.Gutter.OverridenMethod; } } - LineMarkerInfo lineMarkerInfo = new LineMarkerInfo<>(psiElement, psiElement.getTextRange(), icon, Pass.LINE_MARKERS, it -> "Searching for " + "overrided", + LineMarkerInfo lineMarkerInfo = new LineMarkerInfo<>(psiElement, psiElement.getTextRange(), icon, Pass.LINE_MARKERS, it -> "Searching for " + "overridden", OurHandler.INSTANCE, GutterIconRenderer.Alignment.RIGHT); consumer.accept(lineMarkerInfo); diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/liveTemplates/CSharpMainLiveTemplateContributor.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/liveTemplates/CSharpMainLiveTemplateContributor.java index 26f65a675..705b94e00 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/liveTemplates/CSharpMainLiveTemplateContributor.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/liveTemplates/CSharpMainLiveTemplateContributor.java @@ -11,6 +11,7 @@ @ExtensionImpl public class CSharpMainLiveTemplateContributor implements LiveTemplateContributor { @Override + @SuppressWarnings("SpellCheckingInspection") public String groupId() { return "csharpmain"; } @@ -21,6 +22,7 @@ public LocalizeValue groupName() { } @Override + @SuppressWarnings("SpellCheckingInspection") public void contribute(LiveTemplateContributor.Factory factory) { try(Builder builder = factory.newBuilder("csharpmainPsvm", "psvm", "public static void Main(){\r\n" + " $END$\r\n" diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/navigation/CSharpMethodImplementationsSearcher.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/navigation/CSharpMethodImplementationsSearcher.java index 64bf5ee82..e045eeb07 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/navigation/CSharpMethodImplementationsSearcher.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/navigation/CSharpMethodImplementationsSearcher.java @@ -38,7 +38,7 @@ public class CSharpMethodImplementationsSearcher implements DefinitionsScopedSea public boolean execute(DefinitionsScopedSearch.SearchParameters queryParameters, Predicate consumer) { PsiElement element = queryParameters.getElement(); if (element instanceof DotNetVirtualImplementOwner) { - Collection members = ReadAction.compute(() -> OverrideUtil.collectOverridenMembers((DotNetVirtualImplementOwner) element)); + Collection members = ReadAction.compute(() -> OverrideUtil.collectOverriddenMembers((DotNetVirtualImplementOwner) element)); return ContainerUtil.process(members, consumer); } return true; diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/refactoring/introduceVariable/CSharpIntroduceDialog.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/refactoring/introduceVariable/CSharpIntroduceDialog.java index 308cbd953..3801b3885 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/refactoring/introduceVariable/CSharpIntroduceDialog.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/refactoring/introduceVariable/CSharpIntroduceDialog.java @@ -38,7 +38,7 @@ import consulo.language.editor.ui.awt.StringComboboxEditor; /** - * User: Fedor.Korotkov + * @author Fedor.Korotkov */ public class CSharpIntroduceDialog extends DialogWrapper { private JPanel myContentPane; diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/refactoring/introduceVariable/CSharpIntroduceLocalVariableHandler.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/refactoring/introduceVariable/CSharpIntroduceLocalVariableHandler.java index fa6039db6..c1d755a13 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/refactoring/introduceVariable/CSharpIntroduceLocalVariableHandler.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/refactoring/introduceVariable/CSharpIntroduceLocalVariableHandler.java @@ -310,14 +310,14 @@ private static void buildVariableTypeString(Project project, DotNetExpression in } else { - DotNetTypeRef initalizerTypeRef = initializer.toTypeRef(true); - if(initalizerTypeRef == DotNetTypeRef.AUTO_TYPE || initalizerTypeRef == DotNetTypeRef.ERROR_TYPE || initalizerTypeRef == DotNetTypeRef.UNKNOWN_TYPE) + DotNetTypeRef initializerTypeRef = initializer.toTypeRef(true); + if(initializerTypeRef == DotNetTypeRef.AUTO_TYPE || initializerTypeRef == DotNetTypeRef.ERROR_TYPE || initializerTypeRef == DotNetTypeRef.UNKNOWN_TYPE) { builder.append(StringUtil.getShortName(DotNetTypes.System.Object)); } else { - DotNetTypeResolveResult typeResolveResult = initalizerTypeRef.resolve(); + DotNetTypeResolveResult typeResolveResult = initializerTypeRef.resolve(); if(typeResolveResult instanceof CSharpLambdaResolveResult) { List expectedTypeRefs = ExpectedTypeVisitor.findExpectedTypeRefs(initializer); @@ -328,7 +328,7 @@ private static void buildVariableTypeString(Project project, DotNetExpression in } } - CSharpTypeRefPresentationUtil.appendTypeRef(builder, initalizerTypeRef, CSharpTypeRefPresentationUtil.TYPE_KEYWORD); + CSharpTypeRefPresentationUtil.appendTypeRef(builder, initializerTypeRef, CSharpTypeRefPresentationUtil.TYPE_KEYWORD); } } } diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/ide/refactoring/rename/CSharpOverrideElementProcessor.java b/csharp-impl/src/main/java/consulo/csharp/impl/ide/refactoring/rename/CSharpOverrideElementProcessor.java index b22406732..a9865f105 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/ide/refactoring/rename/CSharpOverrideElementProcessor.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/ide/refactoring/rename/CSharpOverrideElementProcessor.java @@ -83,7 +83,7 @@ else if(myLastResult == Messages.YES) public static Set getAllElements(PsiElement element) { Collection temp1 = OverrideUtil.collectOverridingMembers((DotNetVirtualImplementOwner) element); - Collection temp2 = OverrideUtil.collectOverridenMembers((DotNetVirtualImplementOwner) element); + Collection temp2 = OverrideUtil.collectOverriddenMembers((DotNetVirtualImplementOwner) element); Set set = new HashSet(temp1.size() + temp1.size()); set.addAll(temp1); set.addAll(temp2); diff --git a/csharp-impl/src/main/java/consulo/csharp/impl/lang/CSharpIconDescriptorUpdater.java b/csharp-impl/src/main/java/consulo/csharp/impl/lang/CSharpIconDescriptorUpdater.java index d2d77f908..ea72ba76b 100644 --- a/csharp-impl/src/main/java/consulo/csharp/impl/lang/CSharpIconDescriptorUpdater.java +++ b/csharp-impl/src/main/java/consulo/csharp/impl/lang/CSharpIconDescriptorUpdater.java @@ -284,7 +284,7 @@ else if(owner.hasModifier(CSharpModifier.PROTECTED)) iconDescriptor.addLayerIcon(AllIcons.Nodes.FinalMark); } - // dont check it for msil wrappers + // Don't check it for MSIL wrappers if(!(element instanceof MsilElementWrapper)) { if(element instanceof DotNetTypeDeclaration && DotNetRunUtil.hasEntryPoint((DotNetTypeDeclaration) element) || element instanceof DotNetMethodDeclaration && DotNetRunUtil.isEntryPoint( diff --git a/csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpAnonymFieldOrPropertySet.java b/csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpAnonymousFieldOrPropertySet.java similarity index 87% rename from csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpAnonymFieldOrPropertySet.java rename to csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpAnonymousFieldOrPropertySet.java index d7874f4bc..4d6535efd 100644 --- a/csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpAnonymFieldOrPropertySet.java +++ b/csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpAnonymousFieldOrPropertySet.java @@ -20,9 +20,9 @@ /** * @author VISTALL - * @since 07.04.2015 + * @since 2015-04-07 */ -public interface CSharpAnonymFieldOrPropertySet extends CSharpFieldOrPropertySet +public interface CSharpAnonymousFieldOrPropertySet extends CSharpFieldOrPropertySet { @Override DotNetExpression getValueExpression(); diff --git a/csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpFile.java b/csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpFile.java index a0c2399e9..a08fe50f6 100644 --- a/csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpFile.java +++ b/csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpFile.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package consulo.csharp.lang.psi; import consulo.annotation.access.RequiredReadAction; @@ -26,7 +25,7 @@ /** * @author VISTALL - * @since 18.10.14 + * @since 2014-10-18 */ public interface CSharpFile extends DotNetFile, CSharpUsingListOwner { diff --git a/csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpLocalVariable.java b/csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpLocalVariable.java index fdefd11fc..4fca0ec8d 100644 --- a/csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpLocalVariable.java +++ b/csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpLocalVariable.java @@ -23,13 +23,12 @@ /** * @author VISTALL - * @since 16.12.13. + * @since 2013-12-16 */ public interface CSharpLocalVariable extends DotNetLocalVariable, CSharpNamedElement { /** - * - * @return variable type, but dont inherit it from prev child if we use declaration like 'int b, c' + * @return variable type, but do not inherit it from prev child if we use declaration like 'int b, c' */ @Nullable DotNetType getSelfType(); diff --git a/csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpReferenceExpression.java b/csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpReferenceExpression.java index 72cab870f..fb4f52549 100644 --- a/csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpReferenceExpression.java +++ b/csharp-psi-api/src/main/java/consulo/csharp/lang/psi/CSharpReferenceExpression.java @@ -40,7 +40,7 @@ public static enum ResolveToKind QUALIFIED_NAMESPACE, // namespace by fully qualified like 'System.Reflection' system is not searching from context SOFT_QUALIFIED_NAMESPACE, // same as QUALIFIED_NAMESPACE but - soft ref METHOD, - ATTRIBUTE, // return type declaration but ref can find without Attribute sufix + ATTRIBUTE, // return type declaration but ref can find without Attribute suffix NATIVE_TYPE_WRAPPER, // return type declaration of native type ARRAY_METHOD, TYPE_LIKE, // return generic parameter or delegated method or type declaration diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/CSharpPreprocessorParserDefinition.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/CSharpPreprocessorParserDefinition.java index 5c80d9ad5..9f77cfd47 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/CSharpPreprocessorParserDefinition.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/CSharpPreprocessorParserDefinition.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package consulo.csharp.lang.impl; import consulo.annotation.component.ExtensionImpl; import consulo.csharp.lang.CSharpPreprocessorLanguage; import consulo.csharp.lang.impl.lexer._CSharpMacroLexer; import consulo.csharp.lang.impl.parser.CSharpPreprocessorParser; -import consulo.csharp.lang.impl.psi.CSharpPreprocesorTokens; +import consulo.csharp.lang.impl.psi.CSharpPreprocessorTokens; import consulo.csharp.lang.psi.CSharpTokens; import consulo.language.Language; import consulo.language.ast.ASTNode; @@ -35,7 +34,7 @@ /** * @author VISTALL - * @since 18-May-17 + * @since 2017-05-18 */ @ExtensionImpl public class CSharpPreprocessorParserDefinition implements ParserDefinition @@ -75,7 +74,7 @@ public TokenSet getWhitespaceTokens(LanguageVersion languageVersion) @Override public TokenSet getCommentTokens(LanguageVersion languageVersion) { - return TokenSet.create(CSharpPreprocesorTokens.LINE_COMMENT); + return TokenSet.create(CSharpPreprocessorTokens.LINE_COMMENT); } @Override diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/lexer/CSharpPreprocessorHighlightLexer.flex b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/lexer/CSharpPreprocessorHighlightLexer.flex index 1b8dcf2d3..21a2861eb 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/lexer/CSharpPreprocessorHighlightLexer.flex +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/lexer/CSharpPreprocessorHighlightLexer.flex @@ -1,6 +1,6 @@ package consulo.csharp.lang.impl.lexer; -import consulo.csharp.lang.impl.psi.CSharpPreprocesorTokens; +import consulo.csharp.lang.impl.psi.CSharpPreprocessorTokens; import consulo.language.ast.IElementType; import consulo.language.lexer.LexerBase; %% @@ -40,45 +40,45 @@ MACRO_ERROR={MACRO_START}"error" { - {SINGLE_LINE_COMMENT} { return CSharpPreprocesorTokens.LINE_COMMENT; } + {SINGLE_LINE_COMMENT} { return CSharpPreprocessorTokens.LINE_COMMENT; } - {MACRO_IF} { return CSharpPreprocesorTokens.MACRO_IF_KEYWORD; } + {MACRO_IF} { return CSharpPreprocessorTokens.MACRO_IF_KEYWORD; } - {MACRO_ELIF} { return CSharpPreprocesorTokens.MACRO_ELIF_KEYWORD; } + {MACRO_ELIF} { return CSharpPreprocessorTokens.MACRO_ELIF_KEYWORD; } - {MACRO_ELSE} { return CSharpPreprocesorTokens.MACRO_ELSE_KEYWORD; } + {MACRO_ELSE} { return CSharpPreprocessorTokens.MACRO_ELSE_KEYWORD; } - {MACRO_ENDIF} { return CSharpPreprocesorTokens.MACRO_ENDIF_KEYWORD; } + {MACRO_ENDIF} { return CSharpPreprocessorTokens.MACRO_ENDIF_KEYWORD; } - {MACRO_DEFINE} { return CSharpPreprocesorTokens.MACRO_DEFINE_KEYWORD; } + {MACRO_DEFINE} { return CSharpPreprocessorTokens.MACRO_DEFINE_KEYWORD; } - {MACRO_UNDEF} { return CSharpPreprocesorTokens.MACRO_UNDEF_KEYWORD; } + {MACRO_UNDEF} { return CSharpPreprocessorTokens.MACRO_UNDEF_KEYWORD; } - {MACRO_REGION} { return CSharpPreprocesorTokens.MACRO_REGION_KEYWORD; } + {MACRO_REGION} { return CSharpPreprocessorTokens.MACRO_REGION_KEYWORD; } - {MACRO_ENDREGION} { return CSharpPreprocesorTokens.MACRO_ENDREGION_KEYWORD; } + {MACRO_ENDREGION} { return CSharpPreprocessorTokens.MACRO_ENDREGION_KEYWORD; } - {MACRO_PRAGMA} { return CSharpPreprocesorTokens.PRAGMA_KEYWORD; } + {MACRO_PRAGMA} { return CSharpPreprocessorTokens.PRAGMA_KEYWORD; } - {MACRO_NULLABLE} { return CSharpPreprocesorTokens.NULLABLE_KEYWORD; } + {MACRO_NULLABLE} { return CSharpPreprocessorTokens.NULLABLE_KEYWORD; } - {MACRO_WARNING} { return CSharpPreprocesorTokens.WARNING_KEYWORD; } + {MACRO_WARNING} { return CSharpPreprocessorTokens.WARNING_KEYWORD; } - {MACRO_ERROR} { return CSharpPreprocesorTokens.ERROR_KEYWORD; } + {MACRO_ERROR} { return CSharpPreprocessorTokens.ERROR_KEYWORD; } - "(" { return CSharpPreprocesorTokens.LPAR; } + "(" { return CSharpPreprocessorTokens.LPAR; } - ")" { return CSharpPreprocesorTokens.RPAR; } + ")" { return CSharpPreprocessorTokens.RPAR; } - "!" { return CSharpPreprocesorTokens.EXCL; } + "!" { return CSharpPreprocessorTokens.EXCL; } - "&&" { return CSharpPreprocesorTokens.ANDAND; } + "&&" { return CSharpPreprocessorTokens.ANDAND; } - "||" { return CSharpPreprocesorTokens.OROR; } + "||" { return CSharpPreprocessorTokens.OROR; } - {IDENTIFIER} { return CSharpPreprocesorTokens.IDENTIFIER; } + {IDENTIFIER} { return CSharpPreprocessorTokens.IDENTIFIER; } - {WHITE_SPACE} { return CSharpPreprocesorTokens.WHITE_SPACE; } + {WHITE_SPACE} { return CSharpPreprocessorTokens.WHITE_SPACE; } - [^] { return CSharpPreprocesorTokens.BAD_CHARACTER; } + [^] { return CSharpPreprocessorTokens.BAD_CHARACTER; } } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/lexer/_CSharpMacroLexer.flex b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/lexer/_CSharpMacroLexer.flex index 795541c31..2f0be4671 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/lexer/_CSharpMacroLexer.flex +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/lexer/_CSharpMacroLexer.flex @@ -1,6 +1,6 @@ package consulo.csharp.lang.impl.lexer; -import consulo.csharp.lang.impl.psi.CSharpPreprocesorTokens; +import consulo.csharp.lang.impl.psi.CSharpPreprocessorTokens; import consulo.language.ast.IElementType; import consulo.language.lexer.LexerBase; @@ -41,67 +41,67 @@ MACRO_ERROR={MACRO_START}"error" { - {SINGLE_LINE_COMMENT} { return CSharpPreprocesorTokens.LINE_COMMENT; } + {SINGLE_LINE_COMMENT} { return CSharpPreprocessorTokens.LINE_COMMENT; } - {IDENTIFIER} { return CSharpPreprocesorTokens.IDENTIFIER; } + {IDENTIFIER} { return CSharpPreprocessorTokens.IDENTIFIER; } - {WHITE_SPACE} { return CSharpPreprocesorTokens.WHITE_SPACE; } + {WHITE_SPACE} { return CSharpPreprocessorTokens.WHITE_SPACE; } - . { return CSharpPreprocesorTokens.BAD_CHARACTER; } + . { return CSharpPreprocessorTokens.BAD_CHARACTER; } } { - {SINGLE_LINE_COMMENT} { return CSharpPreprocesorTokens.LINE_COMMENT; } + {SINGLE_LINE_COMMENT} { return CSharpPreprocessorTokens.LINE_COMMENT; } - "(" { return CSharpPreprocesorTokens.LPAR; } + "(" { return CSharpPreprocessorTokens.LPAR; } - ")" { return CSharpPreprocesorTokens.RPAR; } + ")" { return CSharpPreprocessorTokens.RPAR; } - "!" { return CSharpPreprocesorTokens.EXCL; } + "!" { return CSharpPreprocessorTokens.EXCL; } - "&&" { return CSharpPreprocesorTokens.ANDAND; } + "&&" { return CSharpPreprocessorTokens.ANDAND; } - "||" { return CSharpPreprocesorTokens.OROR; } + "||" { return CSharpPreprocessorTokens.OROR; } - {IDENTIFIER} { return CSharpPreprocesorTokens.IDENTIFIER; } + {IDENTIFIER} { return CSharpPreprocessorTokens.IDENTIFIER; } - {WHITE_SPACE} { return CSharpPreprocesorTokens.WHITE_SPACE; } + {WHITE_SPACE} { return CSharpPreprocessorTokens.WHITE_SPACE; } - . { return CSharpPreprocesorTokens.BAD_CHARACTER; } + . { return CSharpPreprocessorTokens.BAD_CHARACTER; } } { - {SINGLE_LINE_COMMENT} { return CSharpPreprocesorTokens.LINE_COMMENT; } + {SINGLE_LINE_COMMENT} { return CSharpPreprocessorTokens.LINE_COMMENT; } - {MACRO_IF} { yybegin(MACRO_EXPRESSION); return CSharpPreprocesorTokens.MACRO_IF_KEYWORD; } + {MACRO_IF} { yybegin(MACRO_EXPRESSION); return CSharpPreprocessorTokens.MACRO_IF_KEYWORD; } - {MACRO_ELIF} { yybegin(MACRO_EXPRESSION); return CSharpPreprocesorTokens.MACRO_ELIF_KEYWORD; } + {MACRO_ELIF} { yybegin(MACRO_EXPRESSION); return CSharpPreprocessorTokens.MACRO_ELIF_KEYWORD; } - {MACRO_ELSE} { yybegin(MACRO_ENTERED); return CSharpPreprocesorTokens.MACRO_ELSE_KEYWORD; } + {MACRO_ELSE} { yybegin(MACRO_ENTERED); return CSharpPreprocessorTokens.MACRO_ELSE_KEYWORD; } - {MACRO_ENDIF} { yybegin(MACRO_ENTERED); return CSharpPreprocesorTokens.MACRO_ENDIF_KEYWORD; } + {MACRO_ENDIF} { yybegin(MACRO_ENTERED); return CSharpPreprocessorTokens.MACRO_ENDIF_KEYWORD; } - {MACRO_DEFINE} { yybegin(MACRO_ENTERED); return CSharpPreprocesorTokens.MACRO_DEFINE_KEYWORD; } + {MACRO_DEFINE} { yybegin(MACRO_ENTERED); return CSharpPreprocessorTokens.MACRO_DEFINE_KEYWORD; } - {MACRO_UNDEF} { yybegin(MACRO_ENTERED); return CSharpPreprocesorTokens.MACRO_UNDEF_KEYWORD; } + {MACRO_UNDEF} { yybegin(MACRO_ENTERED); return CSharpPreprocessorTokens.MACRO_UNDEF_KEYWORD; } - {MACRO_REGION} { yybegin(MACRO_ENTERED); return CSharpPreprocesorTokens.MACRO_REGION_KEYWORD; } + {MACRO_REGION} { yybegin(MACRO_ENTERED); return CSharpPreprocessorTokens.MACRO_REGION_KEYWORD; } - {MACRO_ENDREGION} { yybegin(MACRO_ENTERED); return CSharpPreprocesorTokens.MACRO_ENDREGION_KEYWORD; } + {MACRO_ENDREGION} { yybegin(MACRO_ENTERED); return CSharpPreprocessorTokens.MACRO_ENDREGION_KEYWORD; } - {MACRO_PRAGMA} { yybegin(MACRO_ENTERED); return CSharpPreprocesorTokens.PRAGMA_KEYWORD; } + {MACRO_PRAGMA} { yybegin(MACRO_ENTERED); return CSharpPreprocessorTokens.PRAGMA_KEYWORD; } - {MACRO_NULLABLE} { yybegin(MACRO_ENTERED); return CSharpPreprocesorTokens.NULLABLE_KEYWORD; } + {MACRO_NULLABLE} { yybegin(MACRO_ENTERED); return CSharpPreprocessorTokens.NULLABLE_KEYWORD; } - {MACRO_WARNING} { yybegin(MACRO_ENTERED); return CSharpPreprocesorTokens.WARNING_KEYWORD; } + {MACRO_WARNING} { yybegin(MACRO_ENTERED); return CSharpPreprocessorTokens.WARNING_KEYWORD; } - {MACRO_ERROR} { yybegin(MACRO_ENTERED); return CSharpPreprocesorTokens.ERROR_KEYWORD; } + {MACRO_ERROR} { yybegin(MACRO_ENTERED); return CSharpPreprocessorTokens.ERROR_KEYWORD; } - {ILLEGAL_DIRECTIVE} { yybegin(MACRO_EXPRESSION); return CSharpPreprocesorTokens.ILLEGAL_KEYWORD; } + {ILLEGAL_DIRECTIVE} { yybegin(MACRO_EXPRESSION); return CSharpPreprocessorTokens.ILLEGAL_KEYWORD; } - {WHITE_SPACE} { return CSharpPreprocesorTokens.WHITE_SPACE; } + {WHITE_SPACE} { return CSharpPreprocessorTokens.WHITE_SPACE; } - [^] { return CSharpPreprocesorTokens.BAD_CHARACTER; } + [^] { return CSharpPreprocessorTokens.BAD_CHARACTER; } } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/CSharpBuilderWrapper.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/CSharpBuilderWrapper.java index 88e759f51..0bf5512b6 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/CSharpBuilderWrapper.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/CSharpBuilderWrapper.java @@ -239,7 +239,7 @@ public static boolean processState(PreprocessorState preprocessorState, Supplier if(directive instanceof DefinePreprocessorDirective) { - // if code is disabled - dont handle define + // If code is disabled - don't handle define if(!disabledToken) { Set newVariables = new HashSet<>(variables); diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/decl/DeclarationParsing.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/decl/DeclarationParsing.java index 36c07a332..0643ad76b 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/decl/DeclarationParsing.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/decl/DeclarationParsing.java @@ -186,7 +186,7 @@ else if (builder.getTokenType() == OPERATOR_KEYWORD) { if (implementType == null) { builder.error("Name is expected"); - // if we dont have name but we have lbracket - parse as index method + // if we don't have name but we have lbracket - parse as index method parseAfterName(builder, marker, builder.getTokenType() == LBRACKET ? THIS_KEYWORD : null, modifierSet); return; } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/decl/MethodParsing.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/decl/MethodParsing.java index c0ee0c98c..81ae15a81 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/decl/MethodParsing.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/decl/MethodParsing.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package consulo.csharp.lang.impl.parser.decl; import consulo.csharp.lang.impl.parser.CSharpBuilderWrapper; @@ -31,7 +30,7 @@ /** * @author VISTALL - * @since 28.11.13. + * @since 2013-11-28 */ public class MethodParsing extends MemberWithBodyParsing { public static enum Target { @@ -98,7 +97,7 @@ public static void parseMethodStartAfterName(CSharpBuilderWrapper builder, PsiBu GenericParameterParsing.parseList(builder); if (builder.getTokenType() == LPAR) { - // deconstructors dont process any parameters + // deconstructors don't process any parameters if (target == Target.DECONSTRUCTOR) { PsiBuilder.Marker parameterMarker = builder.mark(); builder.advanceLexer(); @@ -263,8 +262,8 @@ private static void parseParameter(CSharpBuilderWrapper builder, IElementType en TypeInfo typeInfo = parseType(builder, flags); if (typeInfo == null) { if (modifierPair.getSecond().isEmpty()) { - // if no modifiers but we failed parse type - need go advance, due ill infinity loop inside parseParameterList, - // but dont eat close brace + // If there are no modifiers but we failed to parse type - we need to advance, + // otherwise there will be an infinite loop inside parseParameterList, but don't eat closing brace if (builder.getTokenType() != end) { builder.advanceLexer(); } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/exp/ExpressionParsing.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/exp/ExpressionParsing.java index 55564ef95..72b02ec3c 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/exp/ExpressionParsing.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/exp/ExpressionParsing.java @@ -1065,9 +1065,9 @@ else if (tokenType == LPAR || tokenType == SEMICOLON || tokenType == LBRACE || t private static void parseLambdaParameterList(final CSharpBuilderWrapper builder) { PsiBuilder.Marker mark = builder.mark(); - boolean lpar = expect(builder, LPAR, null); + boolean lPar = expect(builder, LPAR, null); - if (!lpar) { + if (!lPar) { parseLambdaParameter(builder, true); } else { @@ -1175,10 +1175,10 @@ public static void parseConstructorSuperCall(CSharpBuilderWrapper builder, Modif private static enum AfterNewParsingTarget { NONE, - ANONYM_PROPERTY_SET_LIST, + ANONYMOUS_PROPERTY_SET_LIST, PROPERTY_SET_LIST, - ARRAY_INITIALZER, - DICTIONARY_INITIALZER + ARRAY_INITIALIZER, + DICTIONARY_INITIALIZER } private static PsiBuilder.Marker parseNewExpression(CSharpBuilderWrapper builder, PsiBuilder.Marker mark, ModifierSet set, int flags) { @@ -1215,13 +1215,13 @@ private static PsiBuilder.Marker parseNewExpression(CSharpBuilderWrapper builder case PROPERTY_SET_LIST: parseNamedFieldOrPropertySetBlock(builder, set, flags); break; - case ANONYM_PROPERTY_SET_LIST: - parseAnonymFieldOrPropertySetBlock(builder, set, flags); + case ANONYMOUS_PROPERTY_SET_LIST: + parseAnonymousFieldOrPropertySetBlock(builder, set, flags); break; - case DICTIONARY_INITIALZER: + case DICTIONARY_INITIALIZER: parseDictionaryInitializerList(builder, set); break; - case ARRAY_INITIALZER: + case ARRAY_INITIALIZER: parseArrayInitializer(builder, ARRAY_INITIALIZER, set, flags); break; } @@ -1286,7 +1286,7 @@ private static PsiBuilder.Marker parseStackAllocExpression(CSharpBuilderWrapper private static AfterNewParsingTarget getTarget(CSharpBuilderWrapper builderWrapper, boolean forceArray, TypeInfo typeInfo) { if (typeInfo != null && typeInfo.isArray) { - return AfterNewParsingTarget.ARRAY_INITIALZER; + return AfterNewParsingTarget.ARRAY_INITIALIZER; } if (builderWrapper.getTokenType() != LBRACE) { @@ -1294,23 +1294,23 @@ private static AfterNewParsingTarget getTarget(CSharpBuilderWrapper builderWrapp } if (forceArray) { - return AfterNewParsingTarget.ARRAY_INITIALZER; + return AfterNewParsingTarget.ARRAY_INITIALIZER; } - // force property list, anonym object + // force property list, anonymous object if (typeInfo == null) { - return AfterNewParsingTarget.ANONYM_PROPERTY_SET_LIST; + return AfterNewParsingTarget.ANONYMOUS_PROPERTY_SET_LIST; } if (builderWrapper.lookAhead(1) == LBRACKET) { - return AfterNewParsingTarget.DICTIONARY_INITIALZER; + return AfterNewParsingTarget.DICTIONARY_INITIALIZER; } if (builderWrapper.lookAhead(1) == CSharpTokens.IDENTIFIER && builderWrapper.lookAhead(2) == EQ) { return AfterNewParsingTarget.PROPERTY_SET_LIST; } else { - return AfterNewParsingTarget.ARRAY_INITIALZER; + return AfterNewParsingTarget.ARRAY_INITIALIZER; } } @@ -1391,7 +1391,7 @@ private static PsiBuilder.Marker parseArrayInitializerCompositeValue(CSharpBuild return headerMarker; } - private static void parseAnonymFieldOrPropertySetBlock(CSharpBuilderWrapper builder, ModifierSet set, int flags) { + private static void parseAnonymousFieldOrPropertySetBlock(CSharpBuilderWrapper builder, ModifierSet set, int flags) { PsiBuilder.Marker mark = builder.mark(); builder.advanceLexer(); @@ -1415,7 +1415,7 @@ private static void parseAnonymFieldOrPropertySetBlock(CSharpBuilderWrapper buil tempMarker.error("Can use assign or reference expression"); } else { - tempMarker.done(CSharpElements.ANONYM_FIELD_OR_PROPERTY_SET); + tempMarker.done(CSharpElements.ANONYMOUS_FIELD_OR_PROPERTY_SET); } } } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/macro/PreprocessorExpressionParsing.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/macro/PreprocessorExpressionParsing.java index 0c922382d..9be388c4b 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/macro/PreprocessorExpressionParsing.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/macro/PreprocessorExpressionParsing.java @@ -19,12 +19,12 @@ import org.jspecify.annotations.Nullable; import consulo.csharp.lang.impl.parser.SharedParsingHelpers; import consulo.csharp.lang.impl.psi.CSharpPreprocessorElements; -import consulo.csharp.lang.impl.psi.CSharpPreprocesorTokens; +import consulo.csharp.lang.impl.psi.CSharpPreprocessorTokens; import consulo.language.ast.TokenSet; import consulo.language.parser.PsiBuilder; import consulo.language.ast.IElementType; -public class PreprocessorExpressionParsing implements CSharpPreprocesorTokens, CSharpPreprocessorElements +public class PreprocessorExpressionParsing implements CSharpPreprocessorTokens, CSharpPreprocessorElements { private enum ExprType { diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/macro/PreprocessorParsing.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/macro/PreprocessorParsing.java index c75d9fae7..a3b899823 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/macro/PreprocessorParsing.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/macro/PreprocessorParsing.java @@ -13,19 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package consulo.csharp.lang.impl.parser.macro; -import consulo.csharp.lang.impl.psi.CSharpPreprocesorTokens; +import consulo.csharp.lang.impl.psi.CSharpPreprocessorTokens; import consulo.csharp.lang.impl.psi.CSharpPreprocessorElements; import consulo.language.ast.IElementType; import consulo.language.parser.PsiBuilder; /** * @author VISTALL - * @since 18.12.13. + * @since 2013-12-18 */ -public class PreprocessorParsing implements CSharpPreprocesorTokens, CSharpPreprocessorElements +public class PreprocessorParsing implements CSharpPreprocessorTokens, CSharpPreprocessorElements { public static boolean parse(PsiBuilder builder) { diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/preprocessor/PreprocessorLightParser.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/preprocessor/PreprocessorLightParser.java index c465e1964..f3a3638a3 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/preprocessor/PreprocessorLightParser.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/parser/preprocessor/PreprocessorLightParser.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package consulo.csharp.lang.impl.parser.preprocessor; import consulo.csharp.lang.impl.lexer._CSharpMacroLexer; -import consulo.csharp.lang.impl.psi.CSharpPreprocesorTokens; +import consulo.csharp.lang.impl.psi.CSharpPreprocessorTokens; import consulo.language.ast.IElementType; import consulo.util.lang.StringUtil; @@ -28,7 +27,7 @@ /** * @author VISTALL - * @since 02.03.2016 + * @since 2016-03-02 */ public class PreprocessorLightParser { @@ -72,57 +71,57 @@ public static PreprocessorDirective parse(CharSequence text) switch(state) { case NONE: - if(elementType == CSharpPreprocesorTokens.MACRO_DEFINE_KEYWORD || elementType == CSharpPreprocesorTokens.MACRO_UNDEF_KEYWORD) + if(elementType == CSharpPreprocessorTokens.MACRO_DEFINE_KEYWORD || elementType == CSharpPreprocessorTokens.MACRO_UNDEF_KEYWORD) { state = State.DIRECTIVE; - directive = elementType == CSharpPreprocesorTokens.MACRO_DEFINE_KEYWORD ? Directive.DEFINE : Directive.UNDEF; + directive = elementType == CSharpPreprocessorTokens.MACRO_DEFINE_KEYWORD ? Directive.DEFINE : Directive.UNDEF; } - else if(elementType == CSharpPreprocesorTokens.MACRO_IF_KEYWORD || elementType == CSharpPreprocesorTokens.MACRO_ELIF_KEYWORD) + else if(elementType == CSharpPreprocessorTokens.MACRO_IF_KEYWORD || elementType == CSharpPreprocessorTokens.MACRO_ELIF_KEYWORD) { state = State.DIRECTIVE; - directive = elementType == CSharpPreprocesorTokens.MACRO_IF_KEYWORD ? Directive.IF : Directive.ELIF; + directive = elementType == CSharpPreprocessorTokens.MACRO_IF_KEYWORD ? Directive.IF : Directive.ELIF; } - else if(elementType == CSharpPreprocesorTokens.PRAGMA_KEYWORD) + else if(elementType == CSharpPreprocessorTokens.PRAGMA_KEYWORD) { state = State.DIRECTIVE; directive = Directive.PRAGMA; } - else if(elementType == CSharpPreprocesorTokens.NULLABLE_KEYWORD) + else if(elementType == CSharpPreprocessorTokens.NULLABLE_KEYWORD) { state = State.DIRECTIVE; directive = Directive.NULLABLE; } - else if(elementType == CSharpPreprocesorTokens.WARNING_KEYWORD) + else if(elementType == CSharpPreprocessorTokens.WARNING_KEYWORD) { state = State.DIRECTIVE; directive = Directive.WARNING; } - else if(elementType == CSharpPreprocesorTokens.ERROR_KEYWORD) + else if(elementType == CSharpPreprocessorTokens.ERROR_KEYWORD) { state = State.DIRECTIVE; directive = Directive.ERROR; } - else if(elementType == CSharpPreprocesorTokens.MACRO_ENDIF_KEYWORD) + else if(elementType == CSharpPreprocessorTokens.MACRO_ENDIF_KEYWORD) { state = State.DIRECTIVE; directive = Directive.ENDIF; } - else if(elementType == CSharpPreprocesorTokens.MACRO_REGION_KEYWORD) + else if(elementType == CSharpPreprocessorTokens.MACRO_REGION_KEYWORD) { state = State.DIRECTIVE; directive = Directive.REGION; } - else if(elementType == CSharpPreprocesorTokens.MACRO_ENDREGION_KEYWORD) + else if(elementType == CSharpPreprocessorTokens.MACRO_ENDREGION_KEYWORD) { state = State.DIRECTIVE; directive = Directive.ENDREGION; } - else if(elementType == CSharpPreprocesorTokens.MACRO_ELSE_KEYWORD) + else if(elementType == CSharpPreprocessorTokens.MACRO_ELSE_KEYWORD) { state = State.DIRECTIVE; directive = Directive.ELSE; } - else if(elementType != CSharpPreprocesorTokens.WHITE_SPACE && elementType != CSharpPreprocesorTokens.LINE_COMMENT) + else if(elementType != CSharpPreprocessorTokens.WHITE_SPACE && elementType != CSharpPreprocessorTokens.LINE_COMMENT) { break loop; } @@ -132,12 +131,12 @@ else if(elementType != CSharpPreprocesorTokens.WHITE_SPACE && elementType != CSh { case DEFINE: case UNDEF: - if(elementType == CSharpPreprocesorTokens.IDENTIFIER) + if(elementType == CSharpPreprocessorTokens.IDENTIFIER) { value = lexer.getTokenText(); state = State.VALUE; } - else if(elementType != CSharpPreprocesorTokens.WHITE_SPACE) + else if(elementType != CSharpPreprocessorTokens.WHITE_SPACE) { break loop; } @@ -156,7 +155,7 @@ else if(elementType != CSharpPreprocesorTokens.WHITE_SPACE) } break; default: - if(elementType != CSharpPreprocesorTokens.WHITE_SPACE && elementType != CSharpPreprocesorTokens.LINE_COMMENT) + if(elementType != CSharpPreprocessorTokens.WHITE_SPACE && elementType != CSharpPreprocessorTokens.LINE_COMMENT) { break loop; } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpElementVisitor.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpElementVisitor.java index 443a918c5..cd5b1fb38 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpElementVisitor.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpElementVisitor.java @@ -368,7 +368,7 @@ public void visitLambdaParameterList(CSharpLambdaParameterListImpl list) { visitElement(list); } - public void visitAnonymMethodExpression(CSharpDelegateExpressionImpl method) { + public void visitAnonymousMethodExpression(CSharpDelegateExpressionImpl method) { visitElement(method); } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpElements.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpElements.java index e56d2d611..e37b88949 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpElements.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpElements.java @@ -225,7 +225,7 @@ public interface CSharpElements { IElementType LAMBDA_PARAMETER_LIST = new CompositeElementTypeAsPsiFactory("LAMBDA_PARAMETER_LIST", CSharpLanguage.INSTANCE, CSharpLambdaParameterListImpl::new); - IElementType ANONYM_FIELD_OR_PROPERTY_SET = new CompositeElementTypeAsPsiFactory("ANONYM_FIELD_OR_PROPERTY_SET", CSharpLanguage.INSTANCE, CSharpAnonymFieldOrPropertySetImpl::new); + IElementType ANONYMOUS_FIELD_OR_PROPERTY_SET = new CompositeElementTypeAsPsiFactory("ANONYMOUS_FIELD_OR_PROPERTY_SET", CSharpLanguage.INSTANCE, CSharpAnonymousFieldOrPropertySetImpl::new); IElementType NAMED_FIELD_OR_PROPERTY_SET = new CompositeElementTypeAsPsiFactory("NAMED_FIELD_OR_PROPERTY_SET", CSharpLanguage.INSTANCE, CSharpNamedFieldOrPropertySetImpl::new); diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpPreprocesorTokens.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpPreprocessorTokens.java similarity index 97% rename from csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpPreprocesorTokens.java rename to csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpPreprocessorTokens.java index 9c0c60df3..5f51ee392 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpPreprocesorTokens.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpPreprocessorTokens.java @@ -22,9 +22,9 @@ /** * @author VISTALL - * @since 23.01.14 + * @since 2014-01-23 */ -public interface CSharpPreprocesorTokens extends StandardTokenTypes { +public interface CSharpPreprocessorTokens extends StandardTokenTypes { IElementType MACRO_IF_KEYWORD = new IElementType("MACRO_IF_KEYWORD", CSharpPreprocessorLanguage.INSTANCE); IElementType PRAGMA_KEYWORD = new IElementType("PRAGMA_KEYWORD", CSharpPreprocessorLanguage.INSTANCE); diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpTypeUtil.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpTypeUtil.java index d9ae35539..86efc1be4 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpTypeUtil.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/CSharpTypeUtil.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package consulo.csharp.lang.impl.psi; import consulo.annotation.access.RequiredReadAction; import consulo.csharp.lang.CSharpCastType; import consulo.csharp.lang.impl.psi.cast.CSharpCastSession; -import consulo.csharp.lang.impl.psi.cast.CSharpImpicitCastKey; +import consulo.csharp.lang.impl.psi.cast.CSharpImplicitCastKey; import consulo.csharp.lang.impl.psi.resolve.CSharpResolveContextUtil; import consulo.csharp.lang.impl.psi.source.resolve.type.CSharpArrayTypeRef; import consulo.csharp.lang.impl.psi.source.resolve.type.CSharpRefTypeRef; @@ -269,7 +268,7 @@ protected static InheritResult haveImplicitOrExplicitOperatorTo(DotNetTypeRef to DotNetTypeDeclaration typeDeclaration, DotNetGenericExtractor extractor, Pair castResolvingInfo) { - CSharpImpicitCastKey key = new CSharpImpicitCastKey( + CSharpImplicitCastKey key = new CSharpImplicitCastKey( to, from, castResolvingInfo.getFirst(), @@ -290,7 +289,7 @@ protected static InheritResult haveImplicitOrExplicitOperatorTo(DotNetTypeRef to CSharpElementGroup conversionMethodGroup = resolveContext.findConversionMethodGroup(castType, true); if (conversionMethodGroup == null) { - return session.recordImpicit(key, fail()); + return session.recordImplicit(key, fail()); } // we need swap to vs from for explicit @@ -315,11 +314,11 @@ protected static InheritResult haveImplicitOrExplicitOperatorTo(DotNetTypeRef to } if (CSharpInheritableChecker.create(parameterTypeRef, from).withCastType(CSharpCastType.IMPLICIT, resolveScope).check().isSuccess()) { - return session.recordImpicit(key, new InheritResult(true, declaration)); + return session.recordImplicit(key, new InheritResult(true, declaration)); } } - return session.recordImpicit(key, fail()); + return session.recordImplicit(key, fail()); } @RequiredReadAction diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/UsefulPsiTreeUtil.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/UsefulPsiTreeUtil.java index f4ea72122..5854067e1 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/UsefulPsiTreeUtil.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/UsefulPsiTreeUtil.java @@ -35,7 +35,7 @@ import java.util.function.Function; /** - * @author: Fedor.Korotkov + * @author Fedor.Korotkov */ public class UsefulPsiTreeUtil { diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/cast/CSharpCastSession.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/cast/CSharpCastSession.java index 63cd95b33..a609a26a9 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/cast/CSharpCastSession.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/cast/CSharpCastSession.java @@ -33,7 +33,7 @@ public class CSharpCastSession implements Closeable { private static final ThreadLocal ourSession = ThreadLocal.withInitial(CSharpCastSession::new); - public static CSharpCastSession start(Map implicitCast) { + public static CSharpCastSession start(Map implicitCast) { CSharpCastSession session = get(); session.myServiceImplicitMap = Collections.unmodifiableMap(implicitCast); return session; @@ -45,21 +45,21 @@ public static CSharpCastSession get() { private Set myVisited = new LinkedHashSet<>(); - private Map myServiceImplicitMap = Map.of(); + private Map myServiceImplicitMap = Map.of(); - private Map myNewImplicitMap = new HashMap<>(); + private Map myNewImplicitMap = new HashMap<>(); public boolean mark(DotNetTypeRef top, DotNetTypeRef target, @Nullable Pair castResolvingInfo) { CSharpInheritKey key = new CSharpInheritKey(top, target, castResolvingInfo); return myVisited.add(key); } - public CSharpTypeUtil.InheritResult recordImpicit(CSharpImpicitCastKey key, CSharpTypeUtil.InheritResult result) { + public CSharpTypeUtil.InheritResult recordImplicit(CSharpImplicitCastKey key, CSharpTypeUtil.InheritResult result) { myNewImplicitMap.put(key, result); return result; } - public CSharpTypeUtil.InheritResult getImplicitResult(CSharpImpicitCastKey key) { + public CSharpTypeUtil.InheritResult getImplicitResult(CSharpImplicitCastKey key) { CSharpTypeUtil.InheritResult result = myServiceImplicitMap.get(key); if (result != null) { return result; @@ -68,7 +68,7 @@ public CSharpTypeUtil.InheritResult getImplicitResult(CSharpImpicitCastKey key) return myNewImplicitMap.get(key); } - public void storeImplicit(Map serviceImplicitMap) { + public void storeImplicit(Map serviceImplicitMap) { serviceImplicitMap.putAll(myNewImplicitMap); } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/cast/CSharpImpicitCastKey.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/cast/CSharpImplicitCastKey.java similarity index 77% rename from csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/cast/CSharpImpicitCastKey.java rename to csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/cast/CSharpImplicitCastKey.java index 24e808e7f..0d433a3a7 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/cast/CSharpImpicitCastKey.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/cast/CSharpImplicitCastKey.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package consulo.csharp.lang.impl.psi.cast; import consulo.csharp.lang.CSharpCastType; @@ -24,10 +23,10 @@ * @author VISTALL * @since 2023-12-31 */ -public record CSharpImpicitCastKey(DotNetTypeRef to, - DotNetTypeRef from, - CSharpCastType castType, - GlobalSearchScope searchScope) { - - +public record CSharpImplicitCastKey( + DotNetTypeRef to, + DotNetTypeRef from, + CSharpCastType castType, + GlobalSearchScope searchScope +) { } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/cast/CSharpInheritableCheckerCacher.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/cast/CSharpInheritableCheckerCacher.java index 32bf1b07b..1081944e2 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/cast/CSharpInheritableCheckerCacher.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/cast/CSharpInheritableCheckerCacher.java @@ -51,7 +51,7 @@ public static CSharpInheritableCheckerCacher getInstance(Project project) { } private final Map myCache = new ConcurrentHashMap<>(); - private final Map myImplicitCasts = new ConcurrentSkipListMap<>(Comparator.comparing(Object::toString)); + private final Map myImplicitCasts = new ConcurrentSkipListMap<>(Comparator.comparing(Object::toString)); @Inject public CSharpInheritableCheckerCacher(Project project) { diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/partial/CSharpCompositeTypeDeclaration.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/partial/CSharpCompositeTypeDeclaration.java index 98d908f72..84293250d 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/partial/CSharpCompositeTypeDeclaration.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/partial/CSharpCompositeTypeDeclaration.java @@ -386,7 +386,7 @@ public DotNetNamedElement[] getMembers() @Override public boolean hasModifier(DotNetModifier modifier) { - // composite type dont hold partial modifier + // Composite type doesn't hold partial modifier if(modifier == CSharpModifier.PARTIAL) { return false; diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpAnonymFieldOrPropertySetImpl.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpAnonymousFieldOrPropertySetImpl.java similarity index 84% rename from csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpAnonymFieldOrPropertySetImpl.java rename to csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpAnonymousFieldOrPropertySetImpl.java index f4eeacccf..dc08c5d06 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpAnonymFieldOrPropertySetImpl.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpAnonymousFieldOrPropertySetImpl.java @@ -16,7 +16,7 @@ package consulo.csharp.lang.impl.psi.source; -import consulo.csharp.lang.psi.CSharpAnonymFieldOrPropertySet; +import consulo.csharp.lang.psi.CSharpAnonymousFieldOrPropertySet; import consulo.csharp.lang.impl.psi.CSharpElementVisitor; import consulo.csharp.lang.psi.CSharpReferenceExpression; import consulo.dotnet.psi.DotNetExpression; @@ -27,11 +27,11 @@ /** * @author VISTALL - * @since 07.04.2015 + * @since 2015-04-07 */ -public class CSharpAnonymFieldOrPropertySetImpl extends CSharpElementImpl implements CSharpAnonymFieldOrPropertySet +public class CSharpAnonymousFieldOrPropertySetImpl extends CSharpElementImpl implements CSharpAnonymousFieldOrPropertySet { - public CSharpAnonymFieldOrPropertySetImpl(IElementType elementType) + public CSharpAnonymousFieldOrPropertySetImpl(IElementType elementType) { super(elementType); } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpDelegateExpressionImpl.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpDelegateExpressionImpl.java index b86ab1c1a..6ce01168a 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpDelegateExpressionImpl.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpDelegateExpressionImpl.java @@ -76,7 +76,7 @@ public DotNetParameter[] getParameters() @Override public void accept(CSharpElementVisitor visitor) { - visitor.visitAnonymMethodExpression(this); + visitor.visitAnonymousMethodExpression(this); } @Override diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpLambdaExpressionImpl.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpLambdaExpressionImpl.java index f44d1c01b..15ed5151c 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpLambdaExpressionImpl.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpLambdaExpressionImpl.java @@ -164,15 +164,15 @@ private DotNetTypeRef findPossibleReturnTypeRef() codeBlock.accept(new CSharpRecursiveElementVisitor() { @Override - public void visitAnonymMethodExpression(CSharpDelegateExpressionImpl method) + public void visitAnonymousMethodExpression(CSharpDelegateExpressionImpl method) { - // dont need check return inside anonym + // We don't need to check return inside anonymous method } @Override public void visitLambdaExpression(CSharpLambdaExpressionImpl expression) { - // dont need check return inside lambda + // We don't need to check return inside lambda } @Override diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpNewExpressionImpl.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpNewExpressionImpl.java index 0ad00aa76..043f35e92 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpNewExpressionImpl.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpNewExpressionImpl.java @@ -26,7 +26,7 @@ import consulo.annotation.access.RequiredReadAction; import consulo.csharp.lang.impl.psi.CSharpElementVisitor; import consulo.csharp.lang.psi.*; -import consulo.csharp.lang.impl.psi.source.resolve.type.CSharpAnonymTypeRef; +import consulo.csharp.lang.impl.psi.source.resolve.type.CSharpAnonymousTypeRef; import consulo.csharp.lang.impl.psi.source.resolve.type.CSharpArrayTypeRef; import consulo.csharp.lang.impl.psi.source.resolve.type.CSharpGenericWrapperTypeRef; import consulo.csharp.lang.impl.psi.source.resolve.type.CSharpNullTypeRef; @@ -88,7 +88,7 @@ public DotNetTypeRef toTypeRefImpl(boolean resolveFromParent) { return DotNetTypeRef.ERROR_TYPE; } - return new CSharpAnonymTypeRef(getContainingFile(), fieldOrPropertySetBlock.getSets()); + return new CSharpAnonymousTypeRef(getContainingFile(), fieldOrPropertySetBlock.getSets()); } else { diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpPreprocessorBlockStopImpl.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpPreprocessorBlockStopImpl.java index 5f4067a02..b9ff968f2 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpPreprocessorBlockStopImpl.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpPreprocessorBlockStopImpl.java @@ -20,7 +20,7 @@ import consulo.language.psi.PsiElement; import consulo.language.ast.TokenSet; import consulo.csharp.lang.impl.psi.CSharpMacroElementVisitor; -import consulo.csharp.lang.impl.psi.CSharpPreprocesorTokens; +import consulo.csharp.lang.impl.psi.CSharpPreprocessorTokens; import org.jspecify.annotations.Nullable; @@ -37,14 +37,14 @@ public CSharpPreprocessorBlockStopImpl(IElementType type) public PsiElement getKeywordElement() { - TokenSet tokenSet = TokenSet.create(CSharpPreprocesorTokens.MACRO_ENDIF_KEYWORD, CSharpPreprocesorTokens.MACRO_ENDREGION_KEYWORD); + TokenSet tokenSet = TokenSet.create(CSharpPreprocessorTokens.MACRO_ENDIF_KEYWORD, CSharpPreprocessorTokens.MACRO_ENDREGION_KEYWORD); return findNotNullChildByType(tokenSet); } @Nullable public PsiElement getStopElement() { - return findPsiChildByType(CSharpPreprocesorTokens.MACRO_STOP); + return findPsiChildByType(CSharpPreprocessorTokens.MACRO_STOP); } @Override diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpPreprocessorDefineImpl.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpPreprocessorDefineImpl.java index 655693484..a19ea30f1 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpPreprocessorDefineImpl.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpPreprocessorDefineImpl.java @@ -20,7 +20,7 @@ import consulo.language.ast.IElementType; import consulo.annotation.access.RequiredReadAction; import consulo.csharp.lang.impl.psi.CSharpMacroElementVisitor; -import consulo.csharp.lang.impl.psi.CSharpPreprocesorTokens; +import consulo.csharp.lang.impl.psi.CSharpPreprocessorTokens; import consulo.csharp.lang.psi.CSharpPreprocessorDefine; import consulo.csharp.lang.psi.CSharpPreprocessorVariable; import consulo.csharp.lang.impl.psi.light.CSharpPreprocessorLightVariable; @@ -58,7 +58,7 @@ public String getVarName() @Override public PsiElement getVarElement() { - return findPsiChildByType(CSharpPreprocesorTokens.IDENTIFIER); + return findPsiChildByType(CSharpPreprocessorTokens.IDENTIFIER); } @RequiredReadAction @@ -83,6 +83,6 @@ public CSharpPreprocessorVariable getVariable() @Override public boolean isUnDef() { - return findChildByType(CSharpPreprocesorTokens.MACRO_UNDEF_KEYWORD) != null; + return findChildByType(CSharpPreprocessorTokens.MACRO_UNDEF_KEYWORD) != null; } } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpPreprocessorReferenceExpressionImpl.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpPreprocessorReferenceExpressionImpl.java index 178db75ba..60ea7befb 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpPreprocessorReferenceExpressionImpl.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpPreprocessorReferenceExpressionImpl.java @@ -21,7 +21,7 @@ import consulo.application.util.function.CommonProcessors; import consulo.application.util.function.Processor; import consulo.csharp.lang.impl.psi.CSharpMacroElementVisitor; -import consulo.csharp.lang.impl.psi.CSharpPreprocesorTokens; +import consulo.csharp.lang.impl.psi.CSharpPreprocessorTokens; import consulo.csharp.lang.impl.psi.light.CSharpPreprocessorLightVariable; import consulo.csharp.lang.psi.CSharpPreprocessorDefine; import consulo.csharp.lang.psi.CSharpPreprocessorVariable; @@ -69,7 +69,7 @@ public void accept(CSharpMacroElementVisitor visitor) @Override public PsiElement getElement() { - return findNotNullChildByType(CSharpPreprocesorTokens.IDENTIFIER); + return findNotNullChildByType(CSharpPreprocessorTokens.IDENTIFIER); } @RequiredReadAction diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpReferenceExpressionImplUtil.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpReferenceExpressionImplUtil.java index 9fbf09456..040e31aa5 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpReferenceExpressionImplUtil.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpReferenceExpressionImplUtil.java @@ -90,7 +90,7 @@ public ResolveResult[] resolve(CSharpReferenceExpressionEx ref, boolean resolveF } } - private static class ParamatizeValue + private static class ParametrizedValue { private final Map myResults = new ConcurrentHashMap<>(); @@ -265,7 +265,7 @@ public static ResolveResult[] multiResolve(CSharpReferenceExpressionEx expressio } ResolveResult[] resolveResults; - CSharpReferenceExpressionImplUtil.OurResolver resolver = CSharpReferenceExpressionImplUtil.OurResolver.INSTANCE; + OurResolver resolver = OurResolver.INSTANCE; if(isCacheDisabled(expression)) { resolveResults = resolver.resolve(expression, resolveFromParent); @@ -757,9 +757,9 @@ public static ResolveResult[] tryResolveFromQualifier(CSharpReferenceExpressionE return ResolveResult.EMPTY_ARRAY; } - ParamatizeValue paramatizeValue = LanguageCachedValueUtil.getCachedValue(expression, () -> CachedValueProvider.Result.create(new ParamatizeValue(), PsiModificationTracker.MODIFICATION_COUNT)); + ParametrizedValue parametrizedValue = LanguageCachedValueUtil.getCachedValue(expression, () -> CachedValueProvider.Result.create(new ParametrizedValue(), PsiModificationTracker.MODIFICATION_COUNT)); - return paramatizeValue.get(qualifierElement, element -> tryResolveFromQualifierImpl(expression, element)); + return parametrizedValue.get(qualifierElement, element -> tryResolveFromQualifierImpl(expression, element)); } @RequiredReadAction @@ -1114,7 +1114,7 @@ public static StubScopeProcessor createMemberProcessor(CSharpResolveOptions opti sorter = StaticVsInstanceComparator.create(element); if(completion) { - // append generic when completion due at ANY_MEMBER it dont resolved + // Append generic parameters on completion, because they are not resolved at ANY_MEMBER targets = ArrayUtil.append(targets, ExecuteTarget.GENERIC_PARAMETER); } break; @@ -1138,7 +1138,7 @@ public static StubScopeProcessor createMemberProcessor(CSharpResolveOptions opti } /** - * @return couple of psieelement, first is the last element for walk, second is the stub member for walk + * @return a couple of PsiElements, the first is the last element for walk, the second is the stub member for walk */ @RequiredReadAction public static Couple getResolveLayers(final PsiElement element, boolean strict) diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpStubVariableImplUtil.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpStubVariableImplUtil.java index 249294966..91c516a2f 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpStubVariableImplUtil.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/CSharpStubVariableImplUtil.java @@ -99,7 +99,7 @@ private static DotNetVariable getPrevVariable(CSharpStubVariableImpl variable int i = ArrayUtil.find(stubVariables, variable); if(i <= 0) { - LOGGER.error("Variable dont have type but dont second"); + LOGGER.error("Variable has no type but is not a subsequent declaration"); return null; } @@ -110,7 +110,7 @@ private static DotNetVariable getPrevVariable(CSharpStubVariableImpl variable CSharpStubVariableImpl prevVariable = PsiTreeUtil.getPrevSiblingOfType(variable, variable.getClass()); if(prevVariable == null) { - LOGGER.error("Variable dont have type but dont second"); + LOGGER.error("Variable has no type but is not a subsequent declaration"); return null; } return prevVariable; diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/methodResolving/arguments/NParamsCallArgument.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/methodResolving/arguments/NParamsCallArgument.java index 3d4eab959..4aac92078 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/methodResolving/arguments/NParamsCallArgument.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/methodResolving/arguments/NParamsCallArgument.java @@ -77,7 +77,7 @@ public int calcValid(GlobalSearchScope implicitCastType) } @RequiredReadAction - protected static int validate(@Nullable DotNetTypeRef parameterTypeRef, DotNetTypeRef typeRef, UserDataHolderBase holder, GlobalSearchScope impilictCastResolveScope) + protected static int validate(@Nullable DotNetTypeRef parameterTypeRef, DotNetTypeRef typeRef, UserDataHolderBase holder, GlobalSearchScope implicitCastResolveScope) { int newVal = FAIL; if(parameterTypeRef != null) @@ -88,7 +88,7 @@ protected static int validate(@Nullable DotNetTypeRef parameterTypeRef, DotNetTy } else { - CSharpTypeUtil.InheritResult inheritable = CSharpInheritableChecker.create(parameterTypeRef, typeRef).withCastType(CSharpCastType.IMPLICIT, impilictCastResolveScope).check(); + CSharpTypeUtil.InheritResult inheritable = CSharpInheritableChecker.create(parameterTypeRef, typeRef).withCastType(CSharpCastType.IMPLICIT, implicitCastResolveScope).check(); if(inheritable.isSuccess()) { if(inheritable.isConversion()) diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/overrideSystem/OverrideUtil.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/overrideSystem/OverrideUtil.java index 89e73f3c8..f54cf1365 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/overrideSystem/OverrideUtil.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/overrideSystem/OverrideUtil.java @@ -240,7 +240,7 @@ public static Collection collectOverridingMembers(f } @RequiredReadAction - public static Collection collectOverridenMembers(final DotNetVirtualImplementOwner target) { + public static Collection collectOverriddenMembers(final DotNetVirtualImplementOwner target) { PsiElement parent = target.getParent(); if (!(parent instanceof DotNetTypeDeclaration)) { return Collections.emptyList(); diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/type/CSharpAnonymTypeRef.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/type/CSharpAnonymousTypeRef.java similarity index 93% rename from csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/type/CSharpAnonymTypeRef.java rename to csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/type/CSharpAnonymousTypeRef.java index e1684a7f6..864666d00 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/type/CSharpAnonymTypeRef.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/type/CSharpAnonymousTypeRef.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package consulo.csharp.lang.impl.psi.source.resolve.type; import consulo.annotation.access.RequiredReadAction; import consulo.csharp.lang.impl.psi.light.builder.CSharpLightFieldDeclarationBuilder; import consulo.csharp.lang.impl.psi.light.builder.CSharpLightTypeDeclarationBuilder; -import consulo.csharp.lang.psi.CSharpAnonymFieldOrPropertySet; +import consulo.csharp.lang.psi.CSharpAnonymousFieldOrPropertySet; import consulo.csharp.lang.psi.CSharpFieldOrPropertySet; import consulo.csharp.lang.psi.CSharpModifier; import consulo.csharp.lang.psi.CSharpNamedFieldOrPropertySet; @@ -33,12 +32,11 @@ import consulo.language.psi.PsiFile; import consulo.project.Project; - /** * @author VISTALL - * @since 08.05.14 + * @since 2014-05-08 */ -public class CSharpAnonymTypeRef extends DotNetTypeRefWithCachedResult +public class CSharpAnonymousTypeRef extends DotNetTypeRefWithCachedResult { public static class SetField extends CSharpLightFieldDeclarationBuilder { @@ -69,7 +67,7 @@ public CSharpFieldOrPropertySet getSet() private final PsiFile myContainingFile; private final CSharpFieldOrPropertySet[] mySets; - public CSharpAnonymTypeRef(PsiFile containingFile, CSharpFieldOrPropertySet[] sets) + public CSharpAnonymousTypeRef(PsiFile containingFile, CSharpFieldOrPropertySet[] sets) { super(containingFile.getProject(), containingFile.getResolveScope()); myContainingFile = containingFile; @@ -140,7 +138,7 @@ private DotNetTypeDeclaration createTypeDeclaration() fieldBuilder.withNameIdentifier(nameReferenceExpression); fieldBuilder.setNavigationElement(nameReferenceExpression); } - else if(set instanceof CSharpAnonymFieldOrPropertySet) + else if(set instanceof CSharpAnonymousFieldOrPropertySet) { fieldBuilder.setNavigationElement(set.getValueExpression()); } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/type/SingleNullableStateResolveResult.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/type/SingleNullableStateResolveResult.java index 4f98759d7..c620711d7 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/type/SingleNullableStateResolveResult.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/type/SingleNullableStateResolveResult.java @@ -26,7 +26,7 @@ */ public abstract class SingleNullableStateResolveResult implements DotNetTypeResolveResult { - private NotNullLazyValue myNullalbeCacheValue = NotNullLazyValue.createValue(this::isNullableImpl); + private NotNullLazyValue myNullableCacheValue = NotNullLazyValue.createValue(this::isNullableImpl); @RequiredReadAction public abstract boolean isNullableImpl(); @@ -34,6 +34,6 @@ public abstract class SingleNullableStateResolveResult implements DotNetTypeReso @Override public final boolean isNullable() { - return myNullalbeCacheValue.getValue(); + return myNullableCacheValue.getValue(); } } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/util/CSharpResolveUtil.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/util/CSharpResolveUtil.java index 68c8dabbb..45e44c439 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/util/CSharpResolveUtil.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/util/CSharpResolveUtil.java @@ -383,7 +383,7 @@ else if(entrance instanceof DotNetNamespaceAsElement) } String parentQName = ((DotNetNamespaceAsElement) entrance).getPresentableParentQName(); - // dont go to root namespace + // Don't go to root namespace if(StringUtil.isEmpty(parentQName)) { return true; diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/util/CSharpSearchUtil.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/util/CSharpSearchUtil.java index e93834369..e44d88c9d 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/util/CSharpSearchUtil.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/source/resolve/util/CSharpSearchUtil.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package consulo.csharp.lang.impl.psi.source.resolve.util; import consulo.annotation.access.RequiredReadAction; @@ -40,7 +39,7 @@ /** * @author VISTALL - * @since 18.05.14 + * @since 2014-05-18 */ public class CSharpSearchUtil { @@ -102,7 +101,7 @@ public static DotNetMethodDeclaration findMethodByName(final String name, DotNetGenericExtractor extractor, final int parameterSize) { - //TODO [VISTALL] some hack until we dont make override more powerfull + //TODO [VISTALL] some hack until we make override more powerful if(parentQName != null) { if(owner instanceof DotNetMemberOwner) diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/CSharpMethodDeclStub.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/CSharpMethodDeclStub.java index ce7518155..a7038a404 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/CSharpMethodDeclStub.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/CSharpMethodDeclStub.java @@ -40,13 +40,13 @@ public class CSharpMethodDeclStub extends MemberStub { private final int myOperatorIndex; - public CSharpMethodDeclStub(StubElement parent, @Nullable String qname, int otherModifierMask, int operatorIndex) { - super(parent, CSharpStubElements.METHOD_DECLARATION, qname, otherModifierMask); + public CSharpMethodDeclStub(StubElement parent, @Nullable String qName, int otherModifierMask, int operatorIndex) { + super(parent, CSharpStubElements.METHOD_DECLARATION, qName, otherModifierMask); myOperatorIndex = operatorIndex; } - public CSharpMethodDeclStub(StubElement parent, IStubElementType elementType, String qname, int otherModifierMask, int operatorIndex) { - super(parent, elementType, qname, otherModifierMask); + public CSharpMethodDeclStub(StubElement parent, IStubElementType elementType, String qName, int otherModifierMask, int operatorIndex) { + super(parent, elementType, qName, otherModifierMask); myOperatorIndex = operatorIndex; } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/elementTypes/CSharpConstructorStubElementType.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/elementTypes/CSharpConstructorStubElementType.java index e19e152e4..4a2f5c1fe 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/elementTypes/CSharpConstructorStubElementType.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/elementTypes/CSharpConstructorStubElementType.java @@ -55,9 +55,9 @@ public CSharpConstructorDeclarationImpl createPsi(CSharpMethodDeclStub cSharpTyp @Override public CSharpMethodDeclStub createStub(CSharpConstructorDeclarationImpl methodDeclaration, StubElement stubElement) { - String qname = methodDeclaration.getPresentableParentQName(); + String qName = methodDeclaration.getPresentableParentQName(); int otherModifierMask = CSharpMethodDeclStub.getOtherModifierMask(methodDeclaration); - return new CSharpMethodDeclStub(stubElement, this, qname, otherModifierMask, -1); + return new CSharpMethodDeclStub(stubElement, this, qName, otherModifierMask, -1); } @Override @@ -70,8 +70,8 @@ public void serialize(CSharpMethodDeclStub cSharpTypeStub, StubOutputStream stub @Override public CSharpMethodDeclStub deserialize(StubInputStream stubInputStream, StubElement stubElement) throws IOException { - StringRef qname = stubInputStream.readName(); + StringRef qName = stubInputStream.readName(); int otherModifierMask = stubInputStream.readVarInt(); - return new CSharpMethodDeclStub(stubElement, this, StringRef.toString(qname), otherModifierMask, -1); + return new CSharpMethodDeclStub(stubElement, this, StringRef.toString(qName), otherModifierMask, -1); } } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/elementTypes/CSharpConversionMethodStubElementType.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/elementTypes/CSharpConversionMethodStubElementType.java index 9eedf3ee4..cef54c3aa 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/elementTypes/CSharpConversionMethodStubElementType.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/elementTypes/CSharpConversionMethodStubElementType.java @@ -55,8 +55,8 @@ public CSharpConversionMethodDeclarationImpl createPsi(CSharpMethodDeclStub cSha @Override public CSharpMethodDeclStub createStub(CSharpConversionMethodDeclarationImpl methodDeclaration, StubElement stubElement) { - String qname = methodDeclaration.getPresentableParentQName(); - return new CSharpMethodDeclStub(stubElement, this, qname, 0, -1); + String qName = methodDeclaration.getPresentableParentQName(); + return new CSharpMethodDeclStub(stubElement, this, qName, 0, -1); } @Override @@ -68,7 +68,7 @@ public void serialize(CSharpMethodDeclStub cSharpTypeStub, StubOutputStream stub @Override public CSharpMethodDeclStub deserialize(StubInputStream stubInputStream, StubElement stubElement) throws IOException { - StringRef qname = stubInputStream.readName(); - return new CSharpMethodDeclStub(stubElement, this, StringRef.toString(qname), 0, -1); + StringRef qName = stubInputStream.readName(); + return new CSharpMethodDeclStub(stubElement, this, StringRef.toString(qName), 0, -1); } } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/elementTypes/CSharpIndexMethodStubElementType.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/elementTypes/CSharpIndexMethodStubElementType.java index 6e470e2de..77ed2bfa4 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/elementTypes/CSharpIndexMethodStubElementType.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/elementTypes/CSharpIndexMethodStubElementType.java @@ -72,8 +72,8 @@ public void serialize(CSharpIndexMethodDeclStub methodStub, StubOutputStream stu @Override public CSharpIndexMethodDeclStub deserialize(StubInputStream inputStream, StubElement stubElement) throws IOException { - StringRef qname = inputStream.readName(); + StringRef qName = inputStream.readName(); int otherModifiers = inputStream.readVarInt(); - return new CSharpIndexMethodDeclStub(stubElement, StringRef.toString(qname), otherModifiers); + return new CSharpIndexMethodDeclStub(stubElement, StringRef.toString(qName), otherModifiers); } } diff --git a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/elementTypes/CSharpMethodStubElementType.java b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/elementTypes/CSharpMethodStubElementType.java index 269cfdb8d..2334f68e4 100644 --- a/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/elementTypes/CSharpMethodStubElementType.java +++ b/csharp-psi-impl/src/main/java/consulo/csharp/lang/impl/psi/stub/elementTypes/CSharpMethodStubElementType.java @@ -72,10 +72,10 @@ public void serialize(CSharpMethodDeclStub stub, StubOutputStream stubOutputStre @Override public CSharpMethodDeclStub deserialize(StubInputStream stubInputStream, StubElement stubElement) throws IOException { - StringRef qname = stubInputStream.readName(); + StringRef qName = stubInputStream.readName(); int otherModifierMask = stubInputStream.readVarInt(); int operatorIndex = stubInputStream.readVarInt(); - return new CSharpMethodDeclStub(stubElement, StringRef.toString(qname), otherModifierMask, operatorIndex); + return new CSharpMethodDeclStub(stubElement, StringRef.toString(qName), otherModifierMask, operatorIndex); } @Override diff --git a/extract/consulo-microsoft-dotnet/src/main/java/consulo/csharp/microsoft/module/extension/MicrosoftCSharpModuleExtension.java b/extract/consulo-microsoft-dotnet/src/main/java/consulo/csharp/microsoft/module/extension/MicrosoftCSharpModuleExtension.java index 5b6f50dbc..31e5fd644 100644 --- a/extract/consulo-microsoft-dotnet/src/main/java/consulo/csharp/microsoft/module/extension/MicrosoftCSharpModuleExtension.java +++ b/extract/consulo-microsoft-dotnet/src/main/java/consulo/csharp/microsoft/module/extension/MicrosoftCSharpModuleExtension.java @@ -37,6 +37,7 @@ public MicrosoftCSharpModuleExtension(String id, ModuleRootLayer module) } @Override + @SuppressWarnings("SpellCheckingInspection") public DotNetCompilerOptionsBuilder createCompilerOptionsBuilder() throws DotNetCompileFailedException { MSBaseDotNetCompilerOptionsBuilder optionsBuilder = new MSBaseDotNetCompilerOptionsBuilder(); diff --git a/extract/consulo-mono-dotnet/src/main/java/consulo/csharp/mono/module/extension/MonoCSharpModuleExtension.java b/extract/consulo-mono-dotnet/src/main/java/consulo/csharp/mono/module/extension/MonoCSharpModuleExtension.java index 492e3d39f..69a9957ef 100644 --- a/extract/consulo-mono-dotnet/src/main/java/consulo/csharp/mono/module/extension/MonoCSharpModuleExtension.java +++ b/extract/consulo-mono-dotnet/src/main/java/consulo/csharp/mono/module/extension/MonoCSharpModuleExtension.java @@ -59,6 +59,7 @@ public void setCompilerExecutable(DotNetCompilerOptionsBuilder builder, Path exe } @Override + @SuppressWarnings("SpellCheckingInspection") public DotNetCompilerOptionsBuilder createCompilerOptionsBuilder() throws DotNetCompileFailedException { MSBaseDotNetCompilerOptionsBuilder optionsBuilder = new MSBaseDotNetCompilerOptionsBuilder(); diff --git a/tests/src/test/resources/parsing/Issue267.txt b/tests/src/test/resources/parsing/Issue267.txt index 32469718e..1f76f35b8 100644 --- a/tests/src/test/resources/parsing/Issue267.txt +++ b/tests/src/test/resources/parsing/Issue267.txt @@ -92,7 +92,7 @@ CSHARP_FILE CSharpFieldOrPropertySetBlockImpl(FIELD_OR_PROPERTY_SET_BLOCK) PsiElement(LBRACE)('{') PsiWhiteSpace('\n ') - CSharpAnonymFieldOrPropertySetImpl(ANONYM_FIELD_OR_PROPERTY_SET) + CSharpAnonymousFieldOrPropertySetImpl(ANONYMOUS_FIELD_OR_PROPERTY_SET) CSharpReferenceExpressionImpl(REFERENCE_EXPRESSION) CSharpReferenceExpressionImpl(REFERENCE_EXPRESSION) PsiElement(IDENTIFIER)('String') @@ -100,7 +100,7 @@ CSHARP_FILE PsiElement(IDENTIFIER)('Empty') PsiElement(COMMA)(',') PsiWhiteSpace('\n ') - CSharpAnonymFieldOrPropertySetImpl(ANONYM_FIELD_OR_PROPERTY_SET) + CSharpAnonymousFieldOrPropertySetImpl(ANONYMOUS_FIELD_OR_PROPERTY_SET) CSharpReferenceExpressionImpl(REFERENCE_EXPRESSION) PsiElement(IDENTIFIER)('value') PsiElement(COMMA)(',')