do not autoclose quotes when in strings. Fixes #88265

microsoft · Jan 9, 2020 · e9bb8b3 · e9bb8b3
1 parent 4f6af32
commit e9bb8b3
Show file tree

Hide file tree

Showing 20 changed files with 56 additions and 53 deletions.
diff --git a/extensions/bat/language-configuration.json b/extensions/bat/language-configuration.json
@@ -11,7 +11,7 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""]
+ { "open": "\"", "close": "\"", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],

diff --git a/extensions/clojure/language-configuration.json b/extensions/clojure/language-configuration.json
@@ -11,7 +11,7 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""]
+ { "open": "\"", "close": "\"", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],
@@ -22,4 +22,4 @@
  "folding": {
  "offSide": true
  }
-}
+}
diff --git a/extensions/coffeescript/language-configuration.json b/extensions/coffeescript/language-configuration.json
@@ -12,8 +12,8 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""],
- ["'", "'"]
+ { "open": "\"", "close": "\"", "notIn": ["string"] },
+ { "open": "'", "close": "'", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],

diff --git a/extensions/groovy/language-configuration.json b/extensions/groovy/language-configuration.json
@@ -12,8 +12,8 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""],
- ["'", "'"]
+ { "open": "\"", "close": "\"", "notIn": ["string"] },
+ { "open": "'", "close": "'", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],
@@ -22,4 +22,4 @@
  ["\"", "\""],
  ["'", "'"]
  ]
-}
+}
diff --git a/extensions/ini/ini.language-configuration.json b/extensions/ini/ini.language-configuration.json
@@ -12,8 +12,8 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""],
- ["'", "'"]
+ { "open": "\"", "close": "\"", "notIn": ["string"] },
+ { "open": "'", "close": "'", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],
@@ -22,4 +22,4 @@
  ["\"", "\""],
  ["'", "'"]
  ]
-}
+}
diff --git a/extensions/ini/properties.language-configuration.json b/extensions/ini/properties.language-configuration.json
@@ -12,7 +12,7 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""]
+ { "open": "\"", "close": "\"", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],
@@ -21,4 +21,4 @@
  ["\"", "\""],
  ["'", "'"]
  ]
-}
+}
diff --git a/extensions/java/language-configuration.json b/extensions/java/language-configuration.json
@@ -12,8 +12,8 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""],
- ["'", "'"],
+ { "open": "\"", "close": "\"", "notIn": ["string"] },
+ { "open": "'", "close": "'", "notIn": ["string"] },
  { "open": "/**", "close": " */", "notIn": ["string"] }
  ],
  "surroundingPairs": [

diff --git a/extensions/lua/language-configuration.json b/extensions/lua/language-configuration.json
@@ -12,8 +12,8 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""],
- ["'", "'"]
+ { "open": "\"", "close": "\"", "notIn": ["string"] },
+ { "open": "'", "close": "'", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],

diff --git a/extensions/objective-c/language-configuration.json b/extensions/objective-c/language-configuration.json
@@ -12,8 +12,8 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""],
- ["'", "'"]
+ { "open": "\"", "close": "\"", "notIn": ["string"] },
+ { "open": "'", "close": "'", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],
@@ -22,4 +22,4 @@
  ["\"", "\""],
  ["'", "'"]
  ]
-}
+}
diff --git a/extensions/perl/perl.language-configuration.json b/extensions/perl/perl.language-configuration.json
@@ -11,9 +11,9 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""],
- ["'", "'"],
- ["`", "`"]
+ { "open": "\"", "close": "\"", "notIn": ["string"] },
+ { "open": "'", "close": "'", "notIn": ["string"] },
+ { "open": "`", "close": "`", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],
@@ -29,4 +29,4 @@
  "end": "^(?:(?:=cut\\s*$)|(?:\\s*#endregion\\b))"
  }
  }
-}
+}
diff --git a/extensions/perl/perl6.language-configuration.json b/extensions/perl/perl6.language-configuration.json
@@ -11,9 +11,9 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""],
- ["'", "'"],
- ["`", "`"]
+ { "open": "\"", "close": "\"", "notIn": ["string"] },
+ { "open": "'", "close": "'", "notIn": ["string"] },
+ { "open": "`", "close": "`", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],
@@ -23,4 +23,4 @@
  ["'", "'"],
  ["`", "`"]
  ]
-}
+}
diff --git a/extensions/pug/language-configuration.json b/extensions/pug/language-configuration.json
@@ -11,8 +11,8 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["'", "'"],
- ["\"", "\""]
+ { "open": "\"", "close": "\"", "notIn": ["string"] },
+ { "open": "'", "close": "'", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],
@@ -24,4 +24,4 @@
  "folding": {
  "offSide": true
  }
-}
+}
diff --git a/extensions/r/language-configuration.json b/extensions/r/language-configuration.json
@@ -11,12 +11,14 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""]
+ { "open": "\"", "close": "\"", "notIn": ["string"] },
+ { "open": "'", "close": "'", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""]
+ ["\"", "\""],
+ ["'", "'"]
  ]
-}
+}
diff --git a/extensions/ruby/language-configuration.json b/extensions/ruby/language-configuration.json
@@ -12,15 +12,17 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""],
- ["'", "'"]
+ { "open": "\"", "close": "\"", "notIn": ["string"] },
+ { "open": "'", "close": "'", "notIn": ["string"] },
+ { "open": "`", "close": "`", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
  ["\"", "\""],
- ["'", "'"]
+ ["'", "'"],
+ ["`", "`"]
  ],
  "indentationRules": {
  "increaseIndentPattern": "^\\s*((begin|class|(private|protected)\\s+def|def|else|elsif|ensure|for|if|module|rescue|unless|until|when|while|case)|([^#]*\\sdo\\b)|([^#]*=\\s*(case|if|unless)))\\b([^#\\{;]|(\"|'|\/).*\\4)*(#.*)?$",

diff --git a/extensions/rust/language-configuration.json b/extensions/rust/language-configuration.json
@@ -12,14 +12,13 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""]
+ { "open": "\"", "close": "\"", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""],
- ["'", "'"]
+ ["\"", "\""]
  ],
  "indentationRules": {
  "increaseIndentPattern": "^.*\\{[^}\"']*$|^.*\\([^\\)\"']*$",

diff --git a/extensions/shaderlab/language-configuration.json b/extensions/shaderlab/language-configuration.json
@@ -12,12 +12,12 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""]
+ { "open": "\"", "close": "\"", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
  ["\"", "\""]
  ]
-}
+}
diff --git a/extensions/shellscript/language-configuration.json b/extensions/shellscript/language-configuration.json
@@ -11,9 +11,9 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""],
- ["'", "'"],
- ["`", "`"]
+ { "open": "\"", "close": "\"", "notIn": ["string"] },
+ { "open": "'", "close": "'", "notIn": ["string"] },
+ { "open": "`", "close": "`", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],

diff --git a/extensions/swift/language-configuration.json b/extensions/swift/language-configuration.json
@@ -12,9 +12,9 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""],
- ["'", "'"],
- ["`", "`"]
+ { "open": "\"", "close": "\"", "notIn": ["string"] },
+ { "open": "'", "close": "'", "notIn": ["string"] },
+ { "open": "`", "close": "`", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],
@@ -24,4 +24,4 @@
  ["'", "'"],
  ["`", "`"]
  ]
-}
+}
diff --git a/extensions/vb/language-configuration.json b/extensions/vb/language-configuration.json
@@ -12,7 +12,7 @@
  ["{", "}"],
  ["[", "]"],
  ["(", ")"],
- ["\"", "\""]
+ { "open": "\"", "close": "\"", "notIn": ["string"] }
  ],
  "surroundingPairs": [
  ["{", "}"],
@@ -27,4 +27,4 @@
  "end": "^\\s*#End Region\\b"
  }
  }
-}
+}
diff --git a/extensions/xml/xml.language-configuration.json b/extensions/xml/xml.language-configuration.json
@@ -12,8 +12,8 @@
  { "open": "{", "close": "}"},
  { "open": "[", "close": "]"},
  { "open": "(", "close": ")" },
- { "open": "'", "close": "'" },
- { "open": "\"", "close": "\"" },
+ { "open": "\"", "close": "\"", "notIn": ["string"] },
+ { "open": "'", "close": "'", "notIn": ["string"] },
  { "open": "<!--", "close": "-->", "notIn": [ "comment", "string" ]},
  { "open": "<![CDATA[", "close": "]]>", "notIn": [ "comment", "string" ]}
  ],