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

Merge pull request #814 from DoublesunRUS/bugfix/change-and-validate-search

Browse Source 
Поиск вызовов методов, а не произвольного StaticFeatureAccess
This commit is contained in:
Dmitriy Marmyshev 2021-09-29 16:10:15 +03:00 committed by GitHub
commit c6696f04fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/ChangeAndValidateInsteadOfAroundCheck.java
View File

@ -19,6 +19,8 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.xtext.EcoreUtil2;
import com._1c.g5.v8.dt.bsl.common.Symbols;
import com._1c.g5.v8.dt.bsl.model.FeatureAccess;
import com._1c.g5.v8.dt.bsl.model.Invocation;
import com._1c.g5.v8.dt.bsl.model.Method;
import com._1c.g5.v8.dt.bsl.model.Pragma;
import com._1c.g5.v8.dt.bsl.model.StaticFeatureAccess;
@ -97,9 +99,15 @@ public class ChangeAndValidateInsteadOfAroundCheck
}
boolean hasProceedWithCall = false;
for (StaticFeatureAccess sfa : EcoreUtil2.eAllOfType(method, StaticFeatureAccess.class))
for (Invocation inv : EcoreUtil2.eAllOfType(method, Invocation.class))
{
String featureName = sfa.getName();
FeatureAccess methodAccess = inv.getMethodAccess();
if (!(methodAccess instanceof StaticFeatureAccess))
{
continue;
}
String featureName = methodAccess.getName();
if (PROCEED_WITH_CALL.equalsIgnoreCase(featureName) || PROCEED_WITH_CALL_RUS.equalsIgnoreCase(featureName))
{
hasProceedWithCall = true;