Fixing issues where block comments not starting with whitespace would…

… gobble up piles of code. Test case added. Fixes #8
markstory · Jul 10, 2010 · b7f79a0 · b7f79a0
1 parent 601a950
commit b7f79a0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/models/js_file.php b/models/js_file.php
@@ -95,7 +95,7 @@ protected function _stripComments($line) {
 		$inlineComment = '#^\s*//.*$#s';
 		$blockCommentLine = '#^\s*/\*+.*\*+/#s';
 		$blockCommentStart = '#^\s*/\*+(?!!).*#s';
-		$blockCommentEnd = '#^\s*\*+/.*#s';
+		$blockCommentEnd = '#^.*\*+/.*#s';
 
 		if ($this->_inCommentBlock) {
 			if (preg_match($blockCommentEnd, $line)) {

diff --git a/tests/cases/models/js_file.test.php b/tests/cases/models/js_file.test.php
@@ -184,6 +184,30 @@ function test(thing) {
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * try removing poorly formatted comments.
+ *
+ * @return void
+ */
+	function testPoorlyFormattedCommentRemoval() {
+		$this->JsFile->settings['stripComments'] = true;
+		$this->JsFile->settings['searchPaths'] = array(
+			$this->_pluginPath . 'tests' . DS . 'test_files' . DS . 'js' . DS,
+		);
+		$result = $this->JsFile->process('BadComments');
+		$expected = <<<TEXT
+(function($){function Foo(){this.bar=[];}})
+
+function something() {
+	return 1 + 1;
+}
+function two() {
+	return 1 + 1;
+}
+TEXT;
+		$this->assertEqual($expected, $result);
+	}
+
 /**
  * test that js files cache correctly.
  *