Merge pull request #2675 from adobe/dangoor/css-no-semicolon

fixes #2625: don't auto append semicolon after selecting a property value
adobe · Jan 25, 2013 · 52a17aa · 52a17aa
2 parents b29a743 + 655e2e9
commit 52a17aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/extensions/default/CSSCodeHints/main.js b/src/extensions/default/CSSCodeHints/main.js
@@ -142,9 +142,7 @@ define(function (require, exports, module) {
 
         if (this.info.context === CSSUtils.PROP_NAME) {
             closure = ":";
-        } else if (this.info.context === CSSUtils.PROP_VALUE) {
-            closure = ";";
-        } else {
+        } else if (this.info.context !== CSSUtils.PROP_VALUE) {
             return false;
         }
 

diff --git a/src/extensions/default/CSSCodeHints/unittests.js b/src/extensions/default/CSSCodeHints/unittests.js
@@ -175,12 +175,11 @@ define(function (require, exports, module) {
                 expectCursorAt({ line: 7, ch: 8 });
             });
 
-            it("should insert semicolon followed by newline after prop-value selected", function () {
-                // insert semicolon after previous rule to avoid incorrect tokenizing
+            it("should not insert semicolon after prop-value selected", function () {
                 testDocument.replaceRange(";", { line: 12, ch: 5 });
                 testEditor.setCursorPos({ line: 13, ch: 10 });   // cursor after 'display: '
                 selectHint(CSSCodeHints.cssPropHintProvider, "block");
-                expect(testDocument.getLine(13)).toBe(" display: block;");
+                expect(testDocument.getLine(13)).toBe(" display: block");
             });
 
             it("should insert prop-name directly after semicolon", function () {