Fixes #1 and fixes #7

Author: PhilippSalvisberg

sqldev/src/main/java/org/utplsql/sqldev/parser/UtplsqlParser.xtend

@@ -22,24 +22,45 @@ import org.utplsql.sqldev.model.parser.Unit
 
 class UtplsqlParser {
 	private String plsql
-	private String plsqlWithoutComments
+	private String plsqlReduced
 	private ArrayList<PlsqlObject> objects = new ArrayList<PlsqlObject>
 	private ArrayList<Unit> units = new ArrayList<Unit>
 
 	new(String plsql) {
-		this.plsql = plsql
-		setPlsqlWithoutComments
+		setPlsql(plsql)
+		setPlsqlReduced
 		populateObjects
 		populateUnits
 	}
 
 	/**
-	 * replace multi-line and single-line PL/SQL comments with space
-	 * to simplify and improve performance of subsequent regex expressions 
+	 * JTextComponents uses one position for EOL (end-of-line),
+	 * even on Windows platforms were it is two characters (CR/LF).
+	 * To simplify position calculations and subsequent regular expressions
+	 * all new lines are replaced with LF on Windows platforms.
 	 */
-	private def setPlsqlWithoutComments() {
+	private def setPlsql(String plsql) {
+		val lineSep = System.getProperty("line.separator")
+		if (lineSep.length > 0) {
+			// replace CR/LF with LF on Windows platforms
+			this.plsql = plsql.replace(lineSep, "\n")
+		} else {
+			this.plsql = plsql
+		}
+	}
+	
+	/**
+	 * replace the following expressions with space to simplify 
+	 * and improve performance of subsequent regular expressions:
+	 * - multi-line PL/SQL comments
+	 * - single-line PL/SQL comments
+	 * - string literals
+	 * the result is not valid PL/SQL anymore, but good enough
+	 * to find PL/SQL objects and units
+	 */
+	private def setPlsqlReduced() {
 		val sb = new StringBuffer
-		val p = Pattern.compile("(/\\*(.|[\\r\\n])*?\\*/)|(--.*\\r?\\n)")
+		val p = Pattern.compile("(/\\*(.|[\\n])*?\\*/)|(--[^\\n]*\\n)|('([^']|[\\n])*?')")
 		val m = p.matcher(plsql)
 		var pos = 0
 		while (m.find) {
@@ -59,12 +80,12 @@ class UtplsqlParser {
 		if (plsql.length > pos) {
 			sb.append(plsql.substring(pos, plsql.length))
 		}
-		plsqlWithoutComments=sb.toString
+		plsqlReduced=sb.toString
 	}
 
 	private def populateObjects() {
-		val p = Pattern.compile("(?i)(\\s*)(create(\\s+or\\s+replace)?\\s+(package|type)\\s+(body\\s+)?)(.+?)(\\s+)")
-		val m = p.matcher(plsqlWithoutComments)
+		val p = Pattern.compile("(?i)(\\s*)(create(\\s+or\\s+replace)?\\s+(package|type)\\s+(body\\s+)?)([^\\s]+)(\\s+)")
+		val m = p.matcher(plsqlReduced)
 		while (m.find) {
 			val o = new PlsqlObject
 			o.name = m.group(6)
@@ -73,8 +94,8 @@ class UtplsqlParser {
 		}
 	}
 	private def populateUnits() {
-		val p = Pattern.compile("(?i)(\\s*)(function|procedure)(\\s+)(.+?)(\\s+)")
-		val m = p.matcher(plsqlWithoutComments)
+		val p = Pattern.compile("(?i)(\\s*)(function|procedure)(\\s+)([^\\s\\(;]+)")
+		val m = p.matcher(plsqlReduced)
 		while (m.find) {
 			val u = new Unit
 			u.name = m.group(4)
@@ -104,7 +125,7 @@ class UtplsqlParser {
 	}
 
 	private def fixName(String name) {
-		return name.replace("\"", "").replace(";", "")
+		return name.replace("\"", "")
 	}
 
 	def getObjects() {

sqldev/src/test/java/org/utplsql/sqldev/tests/UtplsqlParserTest.xtend

@@ -84,5 +84,96 @@ class UtplsqlParserTest {
 		Assert.assertEquals("SCOTT.PKG.P", parser.getPathAt(22,9))
 		Assert.assertEquals("SCOTT.PKG.F", parser.getPathAt(22,10))
 		Assert.assertEquals("SCOTT.PKG.F", parser.getPathAt(29,1))
-	}	
+	}
+	
+	@Test
+	def issue_1() {
+		val plsql = '''
+			create or replace package body test_expect_not_to_be_null
+			is
+			    gc_object_name constant varchar2(30) := 't_not_to_be_null_test';
+			    gc_nested_table_name constant varchar2(30) := 'tt_not_to_be_null_test';
+			    gc_varray_name constant varchar2(30) := 'tv_not_to_be_null_test';
+			
+			    procedure cleanup_expectations
+			    is
+			    begin
+			        ut3.ut_expectation_processor.clear_expectations();
+			    end;
+			
+			    procedure create_types
+			    is
+			        pragma autonomous_transaction;
+			    begin
+			        execute immediate 'create type '||gc_object_name||' is object (dummy number)';
+			        execute immediate ' create type '||gc_nested_table_name||' is table of number';
+			        execute immediate '
+			        create type '||gc_varray_name||' is varray(1) of number';
+			    end;
+			
+			    procedure drop_types
+			    is
+			        pragma autonomous_transaction;
+			    begin
+			        execute immediate 'drop type '||gc_object_name;
+			        execute immediate ' drop type '||gc_nested_table_name;
+			        execute immediate '
+			        drop type '||gc_varray_name;
+			    end;
+			
+			    procedure blob_not_null
+			    is
+			    begin
+			        --Act
+			        execute immediate expectations_helpers.unary_expectation_block('not_to_be_null', 'blob', 'to_blob(''abc'')');
+			        --Assert
+			        ut.expect(anydata.convertCollection(ut3.ut_expectation_processor.get_failed_expectations())).to_be_empty();
+			    end;
+			
+			--and so on...
+			
+			end;
+		'''
+		val parser = new UtplsqlParser(plsql)
+		Assert.assertEquals("test_expect_not_to_be_null.cleanup_expectations", parser.getPathAt(7,1))
+		Assert.assertEquals("test_expect_not_to_be_null.create_types", parser.getPathAt(13,1))
+		// was: '||gc_varray_name||'.drop_types
+		Assert.assertEquals("test_expect_not_to_be_null.drop_types", parser.getPathAt(23,1))
+		// was: '||gc_varray_name||'.blob_not_null
+		Assert.assertEquals("test_expect_not_to_be_null.blob_not_null", parser.getPathAt(33,1))
+	}
+
+	@Test
+	def issue_7() {
+		val plsql = '''
+			create or replace package test_expect_not_to_be_null
+			is
+			    --%suite(expectations - not_to_be_null)
+			    --%suitepath(utplsql.core.expectations.unary)
+			
+			    --%aftereach
+			    procedure cleanup_expectations;
+			
+			    --%beforeall
+			    procedure create_types;
+			
+			    --%afterall
+			    procedure drop_types;
+			
+			    --%test(Gives success for not null blob)
+			    procedure blob_not_null;
+			
+			    --%test(Gives success for blob with length 0)
+			    procedure blob_0_length;
+			    
+			    -- ...
+			end test_expect_not_to_be_null;
+			/
+		'''
+		val parser = new UtplsqlParser(plsql)
+		// was: test_expect_not_to_be_null.create_types
+		Assert.assertEquals("test_expect_not_to_be_null.blob_not_null", parser.getPathAt(13,26))
+	}
+
+
 }