Extend parser to support starting line of a package procedure

PhilippSalvisberg · PhilippSalvisberg · commit 3bbc2260794f · 2019-06-19T18:54:06.000+02:00
Works in package specifications and package bodies.
But only for procedures. If a unit is not found 1 is returned.
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/parser/Unit.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/parser/Unit.xtend
@@ -22,4 +22,5 @@ import org.utplsql.sqldev.model.AbstractModel
 class Unit extends AbstractModel {
 	String name
 	Integer position
+	Integer positionOfName
 }
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/parser/UtplsqlParser.xtend b/sqldev/src/main/java/org/utplsql/sqldev/parser/UtplsqlParser.xtend
@@ -110,6 +110,7 @@ class UtplsqlParser {
 			val u = new Unit
 			u.name = m.group(4)
 			u.position = m.start
+			u.positionOfName = m.start(4)
 			units.add(u)
 		}
 	}
@@ -221,5 +222,32 @@ class UtplsqlParser {
 		}
 		return ""
 	}
-
+	
+	private def getStartLine(int position) {
+		var int line = 1
+		for (var i = 0; i < plsql.length; i++) {
+			val c = plsql.substring(i, i+1)
+			if (i > position) {
+				return line
+			} else if (c == '\n') {
+				line = line + 1
+			}
+		}
+		return line
+	}
+	
+	/**
+	 * get the line of a PL/SQL package unit
+	 * 
+	 * @param unitName name of the unit. Only procedures are supported
+	 * @return the line where the procedure is defined
+	 */
+	def getLineOf(String unitName) {
+		for (u : units) {
+			if (u.name.equalsIgnoreCase(unitName)) {
+				return u.positionOfName.startLine
+			}
+		}
+		return 1
+	}
 }
diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/parser/UtplsqlParserTest.xtend b/sqldev/src/test/java/org/utplsql/sqldev/test/parser/UtplsqlParserTest.xtend
@@ -208,4 +208,90 @@ class UtplsqlParserTest extends AbstractJdbcTest {
 		val parser = new UtplsqlParser(plsql)
 		Assert.assertEquals(null, parser.getObjectAt(0))
 	}
+	
+	@Test
+	def void StartLineSpec() {
+		val plsql = '''
+			CREATE OR REPLACE PACKAGE junit_utplsql_test1_pkg is
+			   --%suite(JUnit testing)
+			   --%suitepath(a)
+			
+			   --%context(test context)
+			
+			   --%test(test 1 - OK) 
+			   PRoCeDURE test_1_ok;
+
+			   --%test(test 2 - NOK)
+			   PROCEDURE test_2_nok;
+			
+			   --%test(test 3 - disabled)
+			   --%disabled
+			   PROCEDURE test_3_disabled;
+
+			   --%test(test 4 - errored)
+			   PROCEDURE test_4_errored;
+			   
+			   --%test(test 5 - warnings)
+			   PROCEDURE test_5_warnings;
+			   --%endcontext
+
+			   function my_Func (p IN number) RETURN BOOLEAN;
+			END;
+		'''
+		val parser = new UtplsqlParser(plsql)
+		val first = parser.getLineOf('test_1_ok')
+		Assert.assertEquals(8, first)
+		val last = parser.getLineOf('test_5_warnings')
+		Assert.assertEquals(21, last)
+	}
+
+	@Test
+	def void StartLineBody() {
+		val plsql = '''
+			CREATE OR REPLACE PACKAGE BODY junit_utplsql_test1_pkg IS
+			   PROCEDURE test_1_ok IS
+			   BEGIN
+			      dbms_output.put_line('start test 1');
+			      dbms_session.sleep(1);
+			      ut.expect(1).to_equal(1);
+			      dbms_output.put_line('end test 1');
+			   END;
+			
+			   PROCEDURE test_2_nok IS
+			   BEGIN
+			      dbms_output.put_line('start test 2');
+			      dbms_session.sleep(2);
+			      ut.expect(1, 'first assert.').to_equal(2);
+			      ut.expect(1, 'second assert.').to_equal(2);
+			      dbms_output.put_line('end test 2');
+			   END;
+			   
+			   PROCEDURE test_3_disabled IS
+			   BEGIN
+			      NULL;
+			   END;
+
+			   PROCEDURE test_4_errored IS
+			   BEGIN
+			      EXECUTE IMMEDIATE 'bla bla';
+			   END;
+
+			   PROCEDURE test_5_warnings IS
+			   BEGIN
+			      COMMIT; -- will raise a warning
+				  ut.expect(1).to_equal(1);
+			   END;
+
+			   FUNCTION my_Func (p IN number) RETURN BOOLEAN IS
+			      RETURN TRUE;
+			   END;
+			END;
+		'''
+		val parser = new UtplsqlParser(plsql)
+		val first = parser.getLineOf('test_1_ok')
+		Assert.assertEquals(2, first)
+		val last = parser.getLineOf('test_5_warnings')
+		Assert.assertEquals(29, last)
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,5 @@ import org.utplsql.sqldev.model.AbstractModel`
`22`	`22`	`class Unit extends AbstractModel {`
`23`	`23`	`String name`
`24`	`24`	`Integer position`
	`25`	`+ Integer positionOfName`
`25`	`26`	`}`