Merge branch 'master' of https://github.com/DonJayamanne/pythonVSCode

DonJayamanne · DonJayamanne · commit 757e0921e38b · 2016-05-30T23:54:34.000+10:00
diff --git a/LICENSE b/LICENSE
@@ -19,7 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-<<<<<<< HEAD
-=======
-
->>>>>>> 9109fe02f8f283de4e481528c428c78c846537db
diff --git a/README.md b/README.md
@@ -114,6 +114,9 @@ If you're working in a [virtualenv](https://virtualenv.readthedocs.org/), you ca
 
 ## Change Log
 
+### Version 0.3.9
+* Fixed auto indenting issues [#137](https://github.com/DonJayamanne/pythonVSCode/issues/137)
+
 ### Version 0.3.8
 * Added support for linting using prospector [#130](https://github.com/DonJayamanne/pythonVSCode/pull/130)
 * Fixed issue where environment variables weren't being inherited by the debugger [#109](https://github.com/DonJayamanne/pythonVSCode/issues/109) and [#77](https://github.com/DonJayamanne/pythonVSCode/issues/77)
diff --git a/package.json b/package.json
@@ -2,9 +2,9 @@
   "name": "python",
   "displayName": "Python",
   "description": "Linting, Debugging (multi-threaded, remote), Intellisense, auto-completion, code formatting, snippets, and more.",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "publisher": "donjayamanne",
-  "license": "SEE LICENSE IN LICENSE or README.MD",
+  "license": "MIT",
   "homepage": "https://github.com/DonJayamanne/pythonVSCode/blob/master/README.md",
   "repository": {
     "type": "git",
diff --git a/src/client/extension.ts b/src/client/extension.ts
@@ -44,7 +44,7 @@ export function activate(context: vscode.ExtensionContext) {
     vscode.languages.setLanguageConfiguration(PYTHON.language, {
         onEnterRules: [
             {
-                beforeText: /^(?:def|class|for|if|elif|else|while|try|with|finally).*?:\s*$/,
+                beforeText: /^\s*(?:def|class|for|if|elif|else|while|try|with|finally).*?:\s*$/,
                 action: { indentAction: vscode.IndentAction.Indent }
             }
         ]

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export function activate(context: vscode.ExtensionContext) {`
`44`	`44`	`vscode.languages.setLanguageConfiguration(PYTHON.language, {`
`45`	`45`	`onEnterRules: [`
`46`	`46`	`{`
`47`		`- beforeText: /^(?:def\|class\|for\|if\|elif\|else\|while\|try\|with\|finally).?:\s$/,`
	`47`	`+ beforeText: /^\s(?:def\|class\|for\|if\|elif\|else\|while\|try\|with\|finally).?:\s*$/,`
`48`	`48`	`action: { indentAction: vscode.IndentAction.Indent }`
`49`	`49`	`}`
`50`	`50`	`]`