1c/v8-code-style
1
0
Fork 0
mirror of https://github.com/1C-Company/v8-code-style.git synced 2025-07-17 21:17:41 +02:00
Code Issues Releases Activity

Merge pull request #1396 from 1C-Company/bugfix/1207-accessibility-at-client-with-pragma

Browse Source 
Ложное срабатывание проверки в модулях расширений: 456 #1207
This commit is contained in:
Dmitriy Marmyshev
2023-12-23 00:07:23 -08:00
committed by GitHub
parent dad25b744f b07529268e
commit d0ab1746ce
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -31,6 +31,7 @@
### Исправленные ошибки ### Исправленные ошибки
- Ложное срабатывание проверки module-accessibility-at-client в модулях расширений #1207
## 0.6.0 ## 0.6.0

9
bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/AccessibilityAtClientInObjectModuleCheck.java
View File

@ -164,7 +164,7 @@ public class AccessibilityAtClientInObjectModuleCheck
private boolean allowManagerEventAtClient(EObject object, Module module, ICheckParameters parameters) private boolean allowManagerEventAtClient(EObject object, Module module, ICheckParameters parameters)
{ {
if (object instanceof Method && module.getModuleType() == ModuleType.MANAGER_MODULE if (object instanceof Method && module.getModuleType() == ModuleType.MANAGER_MODULE
&& ((Method)object).isEvent()) && (((Method)object).isEvent() || !((Method)object).getPragmas().isEmpty()))
{ {
String parameterMethodNames = parameters.getString(PARAMETER_ALLOW_MANAGER_EVENTS_AT_CLIENT); String parameterMethodNames = parameters.getString(PARAMETER_ALLOW_MANAGER_EVENTS_AT_CLIENT);
if (StringUtils.isEmpty(parameterMethodNames)) if (StringUtils.isEmpty(parameterMethodNames))
@ -175,8 +175,11 @@ public class AccessibilityAtClientInObjectModuleCheck
Method method = (Method)object; Method method = (Method)object;
Set<String> methodNames = new TreeSet<>(String.CASE_INSENSITIVE_ORDER); Set<String> methodNames = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
methodNames.addAll(List.of(parameterMethodNames.split(",\\s*"))); //$NON-NLS-1$ methodNames.addAll(List.of(parameterMethodNames.split(",\\s*"))); //$NON-NLS-1$
return methodNames.contains(method.getName()); return methodNames.contains(method.getName()) || !method.getPragmas().isEmpty() && method.getPragmas()
.stream()
.map(p -> p.getValue().replace("\"", "")) //$NON-NLS-1$ //$NON-NLS-2$
.filter(StringUtils::isNotBlank)
.anyMatch(methodNames::contains);
} }
return false; return false;
} }

2
tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/AccessibilityAtClientInObjectModuleCheckTest.java
View File

@ -81,7 +81,7 @@ public class AccessibilityAtClientInObjectModuleCheckTest
Marker marker = markers.get(0); Marker marker = markers.get(0);
assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY));
marker = markers.get(1); marker = markers.get(1);
assertEquals("22", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); assertEquals("27", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY));
} }
private List<Marker> getObjectModuleMarkers() private List<Marker> getObjectModuleMarkers()

5
tests/com.e1c.v8codestyle.bsl.itests/workspace/AccessibilityAtClient/src/Catalogs/Products/ManagerModule.bsl
View File

@ -19,6 +19,11 @@ Procedure PresentationFieldsGetProcessing(Fields, StandardProcessing)
// Complaint // Complaint
EndProcedure EndProcedure
&After("PresentationFieldsGetProcessing")
Procedure Compiant2(Fields, StandardProcessing)
// Complaint
EndProcedure
Procedure Noncompiant2() Export Procedure Noncompiant2() Export
// empty // empty
EndProcedure EndProcedure