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

Исправления по аудиту

Browse Source
This commit is contained in:
Dmitriy Marmyshev 2022-07-29 16:24:52 +03:00
parent 1642ee75be
commit fcbbbd14c1
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/ServerExecutionSafeModeCheck.java
View File

@ -16,10 +16,8 @@ import static com._1c.g5.v8.dt.bsl.model.BslPackage.Literals.EXECUTE_STATEMENT;
import static com._1c.g5.v8.dt.bsl.model.BslPackage.Literals.INVOCATION; import static com._1c.g5.v8.dt.bsl.model.BslPackage.Literals.INVOCATION;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EObject;
@ -59,8 +57,11 @@ public class ServerExecutionSafeModeCheck
private static final String CHECK_ID = "server-execution-safe-mode"; //$NON-NLS-1$ private static final String CHECK_ID = "server-execution-safe-mode"; //$NON-NLS-1$
private static final Collection<String> EVAL = Set.of("Eval", "Вычислить"); //$NON-NLS-1$ //$NON-NLS-2$ private static final String EVAL = "Eval"; //$NON-NLS-1$
private static final Collection<String> SAFE_MODE_INVOCATIONS = Set.of("УстановитьБезопасныйРежим", "SetSafeMode"); //$NON-NLS-1$ //$NON-NLS-2$ private static final String EVAL_RU = "Вычислить"; //$NON-NLS-1$
private static final String SAFE_MODE = "SetSafeMode"; //$NON-NLS-1$
private static final String SAFE_MODE_RU = "УстановитьБезопасныйРежим"; //$NON-NLS-1$
@Override @Override
public String getCheckId() public String getCheckId()
@ -87,7 +88,7 @@ public class ServerExecutionSafeModeCheck
IProgressMonitor monitor) IProgressMonitor monitor)
{ {
EObject eObject = (EObject)object; EObject eObject = (EObject)object;
if (!isServerCall(eObject) || (!isExecute(eObject) && !isEval(eObject))) if (!isServerEnv(eObject) || (!isExecute(eObject) && !isEval(eObject)))
{ {
return; return;
} }
@ -106,7 +107,7 @@ public class ServerExecutionSafeModeCheck
} }
} }
private boolean isServerCall(EObject eObject) private boolean isServerEnv(EObject eObject)
{ {
Environmental environmental = EcoreUtil2.getContainerOfType(eObject, Environmental.class); Environmental environmental = EcoreUtil2.getContainerOfType(eObject, Environmental.class);
Environments environments = environmental.environments(); Environments environments = environmental.environments();
@ -325,7 +326,7 @@ public class ServerExecutionSafeModeCheck
String name = invocation.getMethodAccess().getName(); String name = invocation.getMethodAccess().getName();
List<Expression> params = invocation.getParams(); List<Expression> params = invocation.getParams();
return SAFE_MODE_INVOCATIONS.stream().anyMatch(st -> st.equalsIgnoreCase(name)) && params.size() == 1 return (SAFE_MODE_RU.equalsIgnoreCase(name) || SAFE_MODE.equalsIgnoreCase(name)) && params.size() == 1
&& params.get(0) instanceof BooleanLiteral; && params.get(0) instanceof BooleanLiteral;
} }
@ -375,7 +376,11 @@ public class ServerExecutionSafeModeCheck
private boolean isEval(EObject eObject) private boolean isEval(EObject eObject)
{ {
return eObject instanceof Invocation && EVAL.stream() if (eObject instanceof Invocation)
.anyMatch(statement -> statement.equalsIgnoreCase(((Invocation)eObject).getMethodAccess().getName())); {
String name = ((Invocation)eObject).getMethodAccess().getName();
return EVAL_RU.equalsIgnoreCase(name) || EVAL.equalsIgnoreCase(name);
}
return false;
} }
} }