Merge branch 'release/V2.30.0'

Jenkinsfile

@@ -23,7 +23,7 @@ pipeline {
             } else if (env.BRANCH_NAME.startsWith("release") || env.BRANCH_NAME.startsWith("hotfix")) {
               sh "$MVN_HOME/bin/mvn clean javadoc:javadoc install -Dmaven.test.failure.ignore=true -Dgit.commit=\$(git rev-parse --short HEAD)"
             } else {
-              sh "$MVN_HOME/bin/mvn clean package -Dmaven.test.failure.ignore=true -Dgit.commit=\$(git rev-parse --short HEAD)"
+              sh "$MVN_HOME/bin/mvn clean verify -Dmaven.test.failure.ignore=true -Dgit.commit=\$(git rev-parse --short HEAD)"
             }
           }
         }

coverage-report/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>2.29.1</version>
+    <version>2.30.0</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>coverage-report</artifactId>
@@ -21,37 +21,37 @@
     <dependency>
       <groupId>eu.rssw.openedge.rcode</groupId>
       <artifactId>rcode-reader</artifactId>
-      <version>2.29.1</version>
+      <version>2.30.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.sonar.openedge</groupId>
       <artifactId>sonar-openedge-plugin</artifactId>
-      <version>2.29.1</version>
+      <version>2.30.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.29.1</version>
+      <version>2.30.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>2.29.1</version>
+      <version>2.30.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>2.29.1</version>
+      <version>2.30.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>2.29.1</version>
+      <version>2.30.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.checks</groupId>
       <artifactId>openedge-checks</artifactId>
-      <version>2.29.1</version>
+      <version>2.30.0</version>
     </dependency>
   </dependencies>
 

database-parser/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>2.29.1</version>
+    <version>2.30.0</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>database-parser</artifactId>

listing-parser/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>2.29.1</version>
+    <version>2.30.0</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>listing-parser</artifactId>

openedge-checks/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>2.29.1</version>
+    <version>2.30.0</version>
   </parent>
   <groupId>eu.rssw.openedge.checks</groupId>
   <artifactId>openedge-checks</artifactId>
@@ -23,12 +23,12 @@
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>2.29.1</version>
+      <version>2.30.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.29.1</version>
+      <version>2.30.0</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>

openedge-checks/src/main/java/org/sonar/plugins/openedge/api/checks/OpenEdgeProparseCheck.java

@@ -109,7 +109,7 @@ protected NewIssue createIssue(InputFile file, ProToken token, String msg, boole
     NewIssueLocation location = issue.newLocation().on(targetFile);
     if (lineNumber > 0) {
       if (exactLocation) {
-        location.at(targetFile.newRange(token.getLine(), token.getCharPositionInLine() - 1, token.getEndLine(),
+        location.at(targetFile.newRange(token.getLine(), token.getCharPositionInLine(), token.getEndLine(),
             token.getEndCharPositionInLine()));
       } else {
         TextRange range = targetFile.selectLine(lineNumber);
@@ -168,7 +168,7 @@ protected void addLocation(NewIssue issue, InputFile file, JPNode node, String m
       int lineNumber = naturalChild.getLine();
       if (lineNumber > 0) {
         if (exactLocation) {
-          location.at(targetFile.newRange(naturalChild.getLine(), naturalChild.getColumn() - 1,
+          location.at(targetFile.newRange(naturalChild.getLine(), naturalChild.getColumn(),
               naturalChild.getEndLine(), naturalChild.getEndColumn()));
         } else {
           TextRange range = targetFile.selectLine(lineNumber);

openedge-plugin/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>2.29.1</version>
+    <version>2.30.0</version>
   </parent>
   <groupId>eu.rssw.sonar.openedge</groupId>
   <artifactId>sonar-openedge-plugin</artifactId>
@@ -30,17 +30,17 @@
     <dependency>
       <groupId>eu.rssw.openedge.checks</groupId>
       <artifactId>openedge-checks</artifactId>
-      <version>2.29.1</version>
+      <version>2.30.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>2.29.1</version>
+      <version>2.30.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>2.29.1</version>
+      <version>2.30.0</version>
     </dependency>
     <dependency>
       <groupId>org.sonarsource.sonarqube</groupId>

openedge-plugin/src/main/java/org/sonar/plugins/openedge/OpenEdgePlugin.java

@@ -58,11 +58,8 @@ public void define(Context context) {
     context.addExtensions(OpenEdge.class, OpenEdgeDB.class, OpenEdgeSettings.class);
 
     // Profile and rules
-    if (context.getRuntime().getProduct() == SonarProduct.SONARQUBE)
-      context.addExtension(OpenEdgeRulesDefinition.class);
-
-    context.addExtensions(BasicChecksRegistration.class, OpenEdgeProfile.class, OpenEdgeDBProfile.class,
-        OpenEdgeMetrics.class, OpenEdgeComponents.class);
+    context.addExtensions(OpenEdgeRulesDefinition.class, BasicChecksRegistration.class, OpenEdgeProfile.class,
+        OpenEdgeDBProfile.class, OpenEdgeMetrics.class, OpenEdgeComponents.class);
 
     // Syntax highlight and simple CPD
     if (context.getRuntime().getProduct() == SonarProduct.SONARQUBE) {

openedge-plugin/src/main/java/org/sonar/plugins/openedge/foundation/CPDCallback.java

@@ -131,7 +131,7 @@ private void visitCpdNode(JPNode node) {
     }
 
     try {
-      TextRange range = file.newRange(node.getLine(), node.getColumn() - 1, node.getEndLine(), node.getEndColumn());
+      TextRange range = file.newRange(node.getLine(), node.getColumn(), node.getEndLine(), node.getEndColumn());
       cpdTokens.addToken(range, str);
     } catch (IllegalArgumentException | IllegalStateException uncaught) {
       LOG.debug("Unable to create CPD token at position {}:{} to {}:{} - Cause {}", node.getLine(), node.getColumn(),
@@ -143,7 +143,7 @@ private void insertFakeNode(JPNode node) {
     List<JPNode> children = node.getDirectChildren();
     JPNode lastSibling = children.isEmpty() ? node : children.get(children.size() - 1);
     try {
-      TextRange range = file.newRange(node.getLine(), node.getColumn() - 1, lastSibling.getEndLine(), lastSibling.getEndColumn() - 1);
+      TextRange range = file.newRange(node.getLine(), node.getColumn(), lastSibling.getEndLine(), lastSibling.getEndColumn());
       cpdTokens.addToken(range, UUID.randomUUID().toString());
     } catch (IllegalArgumentException | IllegalStateException uncaught) {
       LOG.debug("Unable to create CPD token at position {}:{} to {}:{} - Cause {}", node.getLine(), node.getColumn(),

openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeCPDSensor.java

@@ -136,7 +136,7 @@ private static void processToken(InputFile file, NewCpdTokens cpdTokens, ProToke
     }
 
     try {
-      TextRange range = file.newRange(tok.getLine(), tok.getCharPositionInLine() - 1, tok.getEndLine(),
+      TextRange range = file.newRange(tok.getLine(), tok.getCharPositionInLine(), tok.getEndLine(),
           tok.getEndCharPositionInLine());
       cpdTokens.addToken(range, str);
     } catch (IllegalArgumentException | IllegalStateException uncaught) {

openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeCodeColorizer.java

@@ -117,7 +117,7 @@ private void highlightFile(SensorContext context, IProparseEnvironment session,
 
       if (textType != null) {
         try {
-          TextPointer start = file.newPointer(tok.getLine(), tok.getCharPositionInLine() - 1);
+          TextPointer start = file.newPointer(tok.getLine(), tok.getCharPositionInLine());
           int maxChar = file.selectLine(tok.getEndLine()).end().lineOffset();
           TextPointer end = file.newPointer(tok.getEndLine(), maxChar < tok.getEndCharPositionInLine()
               ? (maxChar > 0 ? maxChar - 1 : 0) : tok.getEndCharPositionInLine());

openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeProparseSensor.java

@@ -349,8 +349,8 @@ private void parseMainFile(SensorContext context, InputFile file, IProparseEnvir
       TextPointer end = null;
       if (InputFileUtils.getRelativePath(file, context.fileSystem()).equals(tok.getFileName())) {
         try {
-          strt = file.newPointer(tok.getLine(), tok.getCharPositionInLine() - 1);
-          end = file.newPointer(tok.getLine(), tok.getCharPositionInLine());
+          strt = file.newPointer(tok.getLine(), tok.getCharPositionInLine());
+          end = file.newPointer(tok.getLine(), tok.getEndCharPositionInLine());
         } catch (IllegalArgumentException uncaught) {
           // Nothing
         }

openedge-plugin/src/test/java/org/sonar/plugins/openedge/OpenEdgePluginTest.java

@@ -49,7 +49,7 @@ public class OpenEdgePluginTest {
   public void testExtensionsSonarLint() {
     Plugin.Context context = new Plugin.Context(SONARLINT_RUNTIME);
     new OpenEdgePlugin().define(context);
-    assertEquals(context.getExtensions().size(), 26);
+    assertEquals(context.getExtensions().size(), 27);
   }
 
   @Test

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>eu.rssw</groupId>
   <artifactId>sonar-openedge</artifactId>
-  <version>2.29.1</version>
+  <version>2.30.0</version>
   <packaging>pom</packaging>
 
   <name>OpenEdge plugin for SonarQube</name>

profiler-parser/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>2.29.1</version>
+    <version>2.30.0</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>profiler-parser</artifactId>

proparse/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>2.29.1</version>
+    <version>2.30.0</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>proparse</artifactId>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>eu.rssw.openedge.rcode</groupId>
       <artifactId>rcode-reader</artifactId>
-      <version>2.29.1</version>
+      <version>2.30.0</version>
     </dependency>
     <dependency>
       <groupId>org.antlr</groupId>

proparse/src/main/antlr4/org/prorefactor/proparse/antlr4/Proparse.g4

@@ -755,6 +755,10 @@ widgetname:
     identifier
   ;
 
+queryIdentifier:
+    identifier
+  ;
+
 identifier:
     // identifier gets us an ID node for an unqualified (local) reference.
     // Only an ID or unreservedkeyword can be used as an unqualified reference.
@@ -1173,7 +1177,7 @@ clearStatement:
   ;
 
 closeQueryStatement:
-    CLOSE QUERY identifier statementEnd
+    CLOSE QUERY queryIdentifier statementEnd
   ;
 
 closeStoredProcedureStatement:
@@ -1851,12 +1855,12 @@ definePropertyAccessorSetBlock:
 
 defineQueryStatement:
     DEFINE defineShare? ( PRIVATE | PROTECTED | STATIC )*
-    QUERY n=identifier
+    QUERY id=identifier
     FOR record recordFields?
     ( COMMA record recordFields? )*
     ( cacheExpr | SCROLLING | RCODEINFORMATION )*
     statementEnd
-    { support.defVar($n.text); }
+    { support.defVar($id.text); }
   ;
 
 defineRectangleStatement:
@@ -2514,7 +2518,7 @@ externalFunctionStatement:
   ;
 
 getStatement:
-    GET findWhich identifier ( lockHow | NOWAIT )* statementEnd
+    GET findWhich queryIdentifier ( lockHow | NOWAIT )* statementEnd
   ;
 
 getKeyValueStatement:
@@ -2960,7 +2964,7 @@ onAction:
   ;
 
 openQueryStatement:
-    OPEN QUERY identifier ( FOR | PRESELECT ) multiRecordSearch
+    OPEN QUERY queryIdentifier ( FOR | PRESELECT ) multiRecordSearch
     openQueryOption*
     statementEnd
   ;
@@ -3268,7 +3272,7 @@ releaseObjectStatement:
   ;
 
 repositionStatement:
-    REPOSITION identifier repositionOption NOERROR? statementEnd
+    REPOSITION queryIdentifier repositionOption NOERROR? statementEnd
   ;
 
 repositionOption:

proparse/src/main/java/org/prorefactor/core/ProToken.java

@@ -77,12 +77,6 @@ public int getLine() {
     return line;
   }
 
-  /**
-   * The index of the first character of this token relative to the beginning of the line at which it occurs.
-   * 
-   * IMPORTANT: While the ANTLR4 Token interface specifies that charPositionInLine should start at 0, the ProToken
-   * implementation starts at 1. This implementation detail might change in the future (if that's not too late).
-   */
   @Override
   public int getCharPositionInLine() {
     return charPositionInLine;
@@ -150,9 +144,7 @@ public int getEndLine() {
   }
 
   /**
-   * The index of the last character of this token relative to the beginning of the line at which it occurs. This means
-   * that the first character of next token will be at this position + 1. Also means that getCharPositionInLine() ==
-   * getEndCharPositionInLine() for single-character tokens.
+   * Line offset **after** the last character of the token
    */
   public int getEndCharPositionInLine() {
     return endCharPositionInLine;