From 7a815f24eedd43f9b1c3954b6f798f1aae9a025a Mon Sep 17 00:00:00 2001 From: mmews Date: Fri, 19 Jul 2024 11:16:20 +0200 Subject: [PATCH] fix --- .../validators/N4JSDeclaredNameValidator.java | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/plugins/org.eclipse.n4js/src/org/eclipse/n4js/validation/validators/N4JSDeclaredNameValidator.java b/plugins/org.eclipse.n4js/src/org/eclipse/n4js/validation/validators/N4JSDeclaredNameValidator.java index eacdb4dac0..323789a28d 100644 --- a/plugins/org.eclipse.n4js/src/org/eclipse/n4js/validation/validators/N4JSDeclaredNameValidator.java +++ b/plugins/org.eclipse.n4js/src/org/eclipse/n4js/validation/validators/N4JSDeclaredNameValidator.java @@ -108,32 +108,33 @@ import com.google.common.collect.ListMultimap; import com.google.common.collect.MultimapBuilder; import com.google.common.collect.Multimaps; +import com.google.common.collect.Sets; import com.google.inject.Inject; -/** - */ -@SuppressWarnings("javadoc") +@SuppressWarnings("all") public class N4JSDeclaredNameValidator extends AbstractN4JSDeclarativeValidator { - @Inject - ValidatorMessageHelper messageHelper; + private ValidatorMessageHelper messageHelper; @Inject - WorkspaceAccess workspaceAccess; + private WorkspaceAccess workspaceAccess; @Inject - SourceElementExtensions sourceElementExtensions; + private SourceElementExtensions sourceElementExtensions; @Inject - JavaScriptVariantHelper jsVariantHelper; + private JavaScriptVariantHelper jsVariantHelper; @Inject - OperationCanceledManager operationCanceledManager; + private OperationCanceledManager operationCanceledManager; + + public static final HashSet BASE_JS_TYPES = Sets. newHashSet( + new String[] { "Object", "Function", "Array", "String", "Boolean", "Number", "Math", "Date", "RegExp", + "Error", "JSON" }); - public static Set BASE_JS_TYPES = Set.of("Object", "Function", "Array", "String", "Boolean", "Number", - "Math", "Date", "RegExp", "Error", "JSON"); - public static Set BASE_GLOBAL_NAMES = Set.of("number", "string", "boolean", "any", "pathSelector", - "i18nKey", "typeName", "N4Object", "N4Class", "N4Enum"); + public static final HashSet BASE_GLOBAL_NAMES = Sets. newHashSet( + new String[] { "number", "string", "boolean", "any", "pathSelector", "i18nKey", "typeName", "N4Object", + "N4Class", "N4Enum" }); /** * NEEEDED @@ -142,8 +143,7 @@ public class N4JSDeclaredNameValidator extends AbstractN4JSDeclarativeValidator * AbstractDeclarativeN4JSValidator */ @Override - public void register(EValidatorRegistrar registrar) { - // nop + public void register(final EValidatorRegistrar registrar) { } /** @@ -641,10 +641,10 @@ private ListMultimap getLocalNames(VariableEnvironmentElement s * Returns nested scopes of 'scope'. Only direct sub-scopes of 'scope' are returned, no sub-sub-scopes, i.e. * sub-scopes of sub-scopes. */ - private Iterator getNestedScopes(VariableEnvironmentElement scope) { - return filter(EcoreUtilN4.getAllContentsFiltered(scope, - it -> !(createsScope(it.eContainer()) && it.eContainer() != scope) - && createsScope(it)), + private Iterator getNestedScopes(final VariableEnvironmentElement scope) { + return filter(filter(EcoreUtilN4.getAllContentsFiltered(scope, + it -> !(createsScope(it.eContainer()) && it.eContainer() != scope)), + it -> createsScope(it)), VariableEnvironmentElement.class); }