Minor update on existing rules

microsoft · Mar 1, 2019 · d079eaf · d079eaf
1 parent 6ad5797
commit d079eaf
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 23 deletions.
diff --git a/rules/X++/BalancedTtsStatement.xq b/rules/X++/BalancedTtsStatement.xq
@@ -6,7 +6,7 @@
 <Diagnostics Category='Mandatory' href='docs.microsoft.com/Socratex/BalancedTtsStatement' Version='1.0'>
 {
 let $scopes := ("IfStatement", "IfThenElseStatement", "WhileStatement", "DoWhileStatement", "ForStatement", "TryStatement", "CatchStatement", "FinallyStatement", "SearchStatement", "SwitchEntryStatement", "Method", "FunctionDeclaration")
-for $a in //(Table | Class | Form | Query)
+for $a in /*
 for $m in $a//Method
 for $s in ($m, $m//*[local-name() = $scopes])
 let $ttsbegin := count( ($s/CompoundStatement/TtsBeginStatement) | ($s/TtsBeginStatement) )

diff --git a/rules/X++/BooleanExpressionWithLiteral.xq b/rules/X++/BooleanExpressionWithLiteral.xq
@@ -5,7 +5,7 @@
 
 <Diagnostics Category='Mandatory' href='docs.microsoft.com/Socratex/BooleanWithLiterals' Version='1.0'>
 {
-    for $c in //(Class | Table | Form | Query)
+    for $c in /*
     for $m in $c//Method
     let $exprs := $m//OrExpression/BooleanLiteralExpression
                 | $m//AndExpression/BooleanLiteralExpression

diff --git a/rules/X++/Breakpoint.xq b/rules/X++/Breakpoint.xq
@@ -4,7 +4,7 @@
 
 <Diagnostics Category='Mandatory' href='docs.microsoft.com/Socratex/Breakpoint' Version='1.0'>
 {
-  for $a in //(Class | Table | Form | Query)
+  for $a in /*
   for $m in $a//Method
   for $s in $m//BreakpointStatement
   return

diff --git a/rules/X++/ComplexityIndentationCombined.xq b/rules/X++/ComplexityIndentationCombined.xq
@@ -63,7 +63,7 @@ declare function local:visitMethod($m as element(Method)) as xs:integer
   let $complexityLimit := xs:integer(30)
   let $indentationLimit := xs:integer(2)
 
-  for $c in //(Class | Table | Form | Query)
+  for $c in /*
   for $m in $c//Method
   let $cmpl := local:MethodComplexity($m)
   where $cmpl > $complexityLimit  

diff --git a/rules/X++/DeleteFromNotUsed.xq b/rules/X++/DeleteFromNotUsed.xq
@@ -4,7 +4,7 @@
 
 <Diagnostics Category='Best practice' href='docs.microsoft.com/Socratex/DeleteFromNotUsed' Version='1.0'>
 {
-  for $a in //(Class | Table | Form | Query)
+  for $a in /*
   for $m in $a//Method
   for $s in $m//SearchStatement
   where count($s/CompoundStatement/*) = 1

diff --git a/rules/X++/DirectSQL.xq b/rules/X++/DirectSQL.xq
@@ -4,7 +4,7 @@
 
 <Diagnostics Category='Mandatory' href='docs.microsoft.com/Socratex/DirectSQL' Version='1.0'>
 {
-  for $a in //(Class | Table | Form | Query)
+  for $a in /*
   for $m in $a/Method 
   for $qc in $m//QualifiedCall
   where $qc/ExpressionQualifier[@Type = "Statement"] 

diff --git a/rules/X++/ExtensionsWithoutPrefix.xq b/rules/X++/ExtensionsWithoutPrefix.xq
@@ -4,9 +4,9 @@
 
 <Diagnostics Category='Mandatory' href='docs.microsoft.com/Socratex/ExtensionsWithoutPrefix' Version='1.0'>
 {
-  for $a in //Class
+  for $a in /Class
   where $a/AttributeList/Attribute[@Name = "ExtensionOf"] 
-  let $targetClass := $a/string(@ExtensionTarget)
+  let $targetClass := $a/AttributeList/Attribute[@Name = "ExtensionOf"]/AttributeExpression/IntrinsicAttributeLiteral[@FunctionName = "classStr"]/string(@Arg1)
   where $a/@Name = fn:concat($targetClass, "_Extension")
   return 
     <Diagnostic>

diff --git a/rules/X++/InsertInLoop.xq b/rules/X++/InsertInLoop.xq
@@ -5,7 +5,7 @@
 <Diagnostics Category='Best practice' href='docs.microsoft.com/Socratex/InsertInLoop' Version='1.0'>
 {
   let $ins := ("Insert", "doInsert")
-  for $a in //(Class | Table | Form | Query)
+  for $a in /*
   for $m in $a//Method
   for $s in $m//(SearchStatement | DoWhileStatement | ForStatement | WhileStatement)
   for $e in $s//CompoundStatement/ExpressionStatement//QualifiedCall[@MethodName = $ins]

diff --git a/rules/X++/MissingClassDocumentation.xq b/rules/X++/MissingClassDocumentation.xq
@@ -10,7 +10,7 @@ declare function functx:trim ( $arg as xs:string? )  as xs:string
 
 <Diagnostics Category='Best practice' href='docs.microsoft.com/Socratex/MissingClassDocumentation' Version='1.0'>
 {
-  for $c in //(Class | Table | Form | Query)[@IsPrivate = "false" and functx:trim(@Comments) = ""]
+  for $c in /(Class | Table | Form | Query)[@IsPrivate = "false" and functx:trim(@Comments) = ""]
   return
     <Diagnostic>
       <Moniker>MissingClassDocumentation</Moniker>

diff --git a/rules/X++/MissingMethodDocumentation.xq b/rules/X++/MissingMethodDocumentation.xq
@@ -10,19 +10,19 @@ declare function functx:trim ( $arg as xs:string? )  as xs:string
 
 <Diagnostics Category='Best practice' href='docs.microsoft.com/Socratex/MissingMethodDocumentation' Version='1.0'>
 {
-  for $c in //(Class | Table | Form)[@IsPrivate = "false"]
-  for $m in $c//Method[@IsPrivate = "false" and functx:trim(@Comments) = ""]
+  for $c in /(Class | Table | Form)[@IsPrivate = "false"]
+  where $c//Method[@IsPrivate = "false" and functx:trim(@Comments) = ""]
   return
     <Diagnostic>
       <Moniker>MissingMethodDocumentation</Moniker>
       <Severity>Warning</Severity>
-      <Path>{string($c/@PathPrefix)}/Method/{string($m/@Name)}</Path>
-      <Message>Documentation is missing for non-private method on non-private class. XML documentation should be created to provide information related to usage.</Message>
+      <Path>{string($c/@PathPrefix)}</Path>
+      <Message>Documentation is missing for non-private method on this non-private class. XML documentation should be created to provide information related to usage.</Message>
       <DiagnosticType>AppChecker</DiagnosticType>
-      <Line>{string($m/@StartLine)}</Line>
-      <Column>{string($m/@StartCol)}</Column>
-      <EndLine>{string($m/@EndLine)}</EndLine>
-      <EndColumn>{string($m/@EndCol)}</EndColumn>
+      <Line>{string($c/@StartLine)}</Line>
+      <Column>{string($c/@StartCol)}</Column>
+      <EndLine>{string($c/@EndLine)}</EndLine>
+      <EndColumn>{string($c/@EndCol)}</EndColumn>
     </Diagnostic>  
 } 
 </Diagnostics>
diff --git a/rules/X++/NestedSearch.xq b/rules/X++/NestedSearch.xq
@@ -4,7 +4,7 @@
 
 <Diagnostics Category='Best practice' href='docs.microsoft.com/Socratex/NestedSearch' Version='1.0'>
 {
-  for $a in //(Class | Table | Form | Query)
+  for $a in /*
   for $m in $a/Method 
   for $nested in $m//(SearchStatement | DoWhileStatement | ForStatement | WhileStatement)//SearchStatement  
   return

diff --git a/rules/X++/SelectForUpdateAbsent.xq b/rules/X++/SelectForUpdateAbsent.xq
@@ -4,7 +4,7 @@
 
 <Diagnostics Category='Best practice' href='docs.microsoft.com/Socratex/SelectForUpdateAbsent' Version='1.0'>
 {
-  for $a in //(Class | Table | Form | Query)
+  for $a in /*
   for $m in $a/Method 
   for $q in $m//Query
   where $q/data(SelectionHints) = "ForUpdate"

diff --git a/rules/X++/SelectUsingFirstOnly.xq b/rules/X++/SelectUsingFirstOnly.xq
@@ -5,7 +5,7 @@
 <Diagnostics Category='Best practice' href='docs.microsoft.com/Socratex/SelectUsingFirstOnly' Version='1.0'>
 {
   let $hints := ("FirstOnly1", "FirstOnly", "NoFetch")
-  for $a in //(Class | Table | Form | Query)
+  for $a in /*
   for $m in $a//Method
   for $q in $m//Query
   where string(node-name($q/..)) != "JoinSpecification" (: only outermost query :)

diff --git a/rules/X++/SystemReflection.xq b/rules/X++/SystemReflection.xq
@@ -4,7 +4,7 @@
 
 <Diagnostics Category='Mandatory' href='docs.microsoft.com/Socratex/SystemReflection' Version='1.0'>
 {
-  for $a in //(Class | Table | Form | Query)
+  for $a in /*
   for $m in $a//Method
   where $m//*[starts-with(@Type, "System.Reflection")]
   return

diff --git a/rules/X++/TableIndex.xq b/rules/X++/TableIndex.xq
@@ -4,7 +4,7 @@
 
 <Diagnostics Category='Mandatory' href='docs.microsoft.com/Socratex/TableIndex' Version='1.0'>
 {
-  for $t in //Table
+  for $t in /Table
   where not (exists ($t//ClusteredIndex))
   return
     <Diagnostic>