removed unnecessary todos (97dbbafa) · Commits · MTS / TTCN-3 / T3Q

de.ugoe.cs.swe.TTCN3/src/de/ugoe/cs/swe/validation/CodeStyleValidator.xtend

+143 −143

Original line number	Diff line number	Diff line
		@@ -2,11 +2,14 @@ package de.ugoe.cs.swe.validation

		import com.google.common.base.Stopwatch
		import com.google.common.base.Strings
		import com.google.inject.Inject
		import de.ugoe.cs.swe.TTCN3Configuration.QualityCheckProfile
		import de.ugoe.cs.swe.common.ConfigTools
		import de.ugoe.cs.swe.common.MiscTools
		import de.ugoe.cs.swe.common.logging.LoggingInterface.LogLevel
		import de.ugoe.cs.swe.common.logging.LoggingInterface.MessageClass
		import de.ugoe.cs.swe.scoping.ImportData
		import de.ugoe.cs.swe.scoping.TTCN3GlobalScopeProvider
		import de.ugoe.cs.swe.tTCN3.AltConstruct
		import de.ugoe.cs.swe.tTCN3.AltstepDef
		import de.ugoe.cs.swe.tTCN3.AltstepInstance
		@@ -33,7 +36,6 @@ import de.ugoe.cs.swe.tTCN3.ModuleParDef
		import de.ugoe.cs.swe.tTCN3.ModuleParameter
		import de.ugoe.cs.swe.tTCN3.PermutationMatch
		import de.ugoe.cs.swe.tTCN3.PortDef
		import de.ugoe.cs.swe.tTCN3.PortInstance
		import de.ugoe.cs.swe.tTCN3.PredefinedValue
		import de.ugoe.cs.swe.tTCN3.RecordDefNamed
		import de.ugoe.cs.swe.tTCN3.RecordOfDefNamed
		@@ -49,16 +51,17 @@ import de.ugoe.cs.swe.tTCN3.SubTypeDefNamed
		import de.ugoe.cs.swe.tTCN3.TTCN3Module
		import de.ugoe.cs.swe.tTCN3.TTCN3Package
		import de.ugoe.cs.swe.tTCN3.TTCN3Reference
		import de.ugoe.cs.swe.tTCN3.TempVarList
		import de.ugoe.cs.swe.tTCN3.TemplateDef
		import de.ugoe.cs.swe.tTCN3.TestcaseDef
		import de.ugoe.cs.swe.tTCN3.TimerInstance
		import de.ugoe.cs.swe.tTCN3.Type
		import de.ugoe.cs.swe.tTCN3.TypeDef
		import de.ugoe.cs.swe.tTCN3.UnionDefNamed
		import de.ugoe.cs.swe.tTCN3.VarInstance
		import de.ugoe.cs.swe.tTCN3.VarList
		import java.util.ArrayList
		import java.util.List
		import java.util.Map
		import java.util.Set
		import java.util.concurrent.ConcurrentHashMap
		import java.util.regex.Matcher
		import java.util.regex.Pattern
		@@ -66,6 +69,7 @@ import org.eclipse.emf.ecore.EClass
		import org.eclipse.emf.ecore.EObject
		import org.eclipse.xtext.nodemodel.INode
		import org.eclipse.xtext.nodemodel.util.NodeModelUtils
		import org.eclipse.xtext.scoping.IGlobalScopeProvider
		import org.eclipse.xtext.validation.AbstractDeclarativeValidator
		import org.eclipse.xtext.validation.Check
		import org.eclipse.xtext.validation.EValidatorRegistrar
		@@ -73,13 +77,6 @@ import org.eclipse.xtext.validation.EValidatorRegistrar
		import static extension de.ugoe.cs.swe.common.TTCN3ReferenceHelper.*
		import static extension de.ugoe.cs.swe.common.TTCN3ScopeHelper.*
		import static extension org.eclipse.xtext.EcoreUtil2.*
		import org.eclipse.xtext.scoping.IGlobalScopeProvider
		import com.google.inject.Inject
		import de.ugoe.cs.swe.scoping.TTCN3GlobalScopeProvider
		import de.ugoe.cs.swe.scoping.ImportData
		import java.util.Set
		import de.ugoe.cs.swe.tTCN3.TempVarList
		import de.ugoe.cs.swe.tTCN3.VarList

		class CheckDefinitionComeFirstParameter {
		public boolean hasOtherDefinitions
		@@ -153,7 +150,7 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		activeProfile.maximumAllowedNestingDepth + ")!"
		warning(
		message,
		null, //TODO: add pseudo feature to mark this warning correct in eclipse editor
		null,
		MessageClass.STYLE.toString,
		node.startLine.toString,
		node.endLine.toString,
		@@ -251,7 +248,7 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		val message = "Keyword \"permutation\" is used!"
		warning(
		message,
		null, //TODO: add pseudo feature to mark this warning correct in eclipse editor
		null,
		MessageClass.STYLE.toString,
		node.startLine.toString,
		node.endLine.toString,
		@@ -270,7 +267,7 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		val message = "Keyword \"anytype\" is used!"
		warning(
		message,
		null, //TODO: add pseudo feature to mark this warning correct in eclipse editor
		null,
		MessageClass.STYLE.toString,
		node.startLine.toString,
		node.endLine.toString,
		@@ -293,7 +290,7 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		baseTemplate.base.name + "\")!"
		warning(
		message,
		null, //TODO: maybe use BaseTemplate to have the correct feature.
		null,
		MessageClass.STYLE.toString,
		node.startLine.toString,
		node.endLine.toString,
		@@ -348,7 +345,7 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		statistics.incrementCountStyle
		warning(
		message,
		null, //TODO: struct feature
		null,
		MessageClass.STYLE.toString,
		line.toString,
		line.toString,
		@@ -422,7 +419,7 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		configuredOrder.eClassesToString + ")!"
		warning(
		message,
		null, //TODO: struct feature
		null,
		MessageClass.STYLE.toString,
		node.startLine.toString,
		node.endLine.toString,
		@@ -485,7 +482,7 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		val INode node = NodeModelUtils.getNode(d)
		warning(
		message,
		null, //TODO: EStructuralFeature
		null,
		MessageClass.STYLE.toString,
		node.startLine.toString,
		node.endLine.toString,
		@@ -561,7 +558,7 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		val INode node = NodeModelUtils.getNode(detailDef)
		warning(
		message,
		null, //TODO: EStructuralFeature
		null,
		MessageClass.STYLE.toString,
		node.startLine.toString,
		node.endLine.toString,
		@@ -682,7 +679,7 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		val INode node = NodeModelUtils.getNode(detailDef)
		warning(
		message,
		null, //TODO: EStructuralFeature
		null,
		MessageClass.STYLE.toString,
		node.startLine.toString,
		node.endLine.toString,
		@@ -704,7 +701,9 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		if (!found) {

		val TTCN3GlobalScopeProvider scopeProvider = globalScopeProvider as TTCN3GlobalScopeProvider
		if (scopeProvider == null) { return true }
		if (scopeProvider == null) {
		return true
		}

		val modulesImportingThis = scopeProvider.getImportingModules(parent);

		@@ -724,7 +723,6 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		// }
		// }
		// }

		}

		return !found
		@@ -745,7 +743,7 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		val INode node = NodeModelUtils.getNode(template)
		warning(
		message,
		null, //TODO: EStructuralFeature
		null,
		MessageClass.STYLE.toString,
		node.startLine.toString,
		node.endLine.toString,
		@@ -792,7 +790,7 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		statistics.incrementCountStyle
		warning(
		message,
		null, //TODO: EStructuralFeature
		null,
		MessageClass.STYLE.toString,
		node.startLine.toString,
		node.endLine.toString,
		@@ -1029,7 +1027,7 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		val INode node = NodeModelUtils.getNode(p)
		warning(
		message,
		null, //TODO: EStructuralFeature
		null,
		MessageClass.STYLE.toString,
		node.startLine.toString,
		node.endLine.toString,
		@@ -1081,7 +1079,7 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		val INode node = NodeModelUtils.getNode(variable)
		warning(
		message,
		null, //TODO: EStructuralFeature
		null,
		MessageClass.STYLE.toString,
		node.startLine.toString,
		node.endLine.toString,
		@@ -1120,7 +1118,7 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		val INode node = NodeModelUtils.getNode(value)
		warning(
		message,
		null, //TODO: EStructuralFeature
		null,
		MessageClass.STYLE.toString,
		node.startLine.toString,
		node.endLine.toString,
		@@ -1137,7 +1135,9 @@ class CodeStyleValidator extends AbstractDeclarativeValidator {
		}

		val TTCN3GlobalScopeProvider scopeProvider = globalScopeProvider as TTCN3GlobalScopeProvider
		if (scopeProvider == null) { return }
		if (scopeProvider == null) {
		return
		}

		val Set<ImportData> data = scopeProvider.importedObjects(module.eResource);