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

DonJayamanne · DonJayamanne · commit 8036f3b162fc · 2017-09-20T08:05:08.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,20 +1,25 @@
 language: python
 sudo: required
+dist: trusty
 
+addons:
+  apt:
+    packages:
+      - libsecret-1-dev
 matrix:
     include:
         # # Use the built in venv for linux builds
-        # - os: linux
-        #   sudo: required
-        #   python: 2.7
+        - os: linux
+          sudo: required
+          python: 2.7
         - os: linux
           sudo: required
           python: 3.5
         # # Use generic language for osx
-        # - os: osx
-        #   language: generic
-        #   env: PYTHON=2.7.10
-        # # Use generic language for osx
+        - os: osx
+          language: generic
+          env: PYTHON=2.7.10
+        # Use generic language for osx
         - os: osx
           language: generic
           env: PYTHON=3.5.1
@@ -28,8 +33,8 @@ before_install: |
   git submodule update --init --recursive
   git clone https://github.com/creationix/nvm.git ./.nvm
   source ./.nvm/nvm.sh
-  nvm install 6.6.0
-  nvm use 6.6.0
+  nvm install 7.2.1
+  nvm use 7.2.1
   npm config set python `which python`
   if [ "$TRAVIS_OS_NAME" == "osx" ]; then
     brew update; 
diff --git a/src/client/workspaceSymbols/generator.ts b/src/client/workspaceSymbols/generator.ts
@@ -42,11 +42,11 @@ export class Generator implements vscode.Disposable {
         if (path.dirname(outputFile) === source.directory) {
             outputFile = path.basename(outputFile);
         }
-        outputFile = outputFile.indexOf(' ') > 0 ? `"${outputFile}"` : outputFile;
         const outputDir = path.dirname(outputFile);
         if (!fs.existsSync(outputDir)){
             fs.mkdirSync(outputDir);
         }
+        outputFile = outputFile.indexOf(' ') > 0 ? `"${outputFile}"` : outputFile;
         args.push(`-o ${outputFile}`, '.');
         this.output.appendLine('-'.repeat(10) + 'Generating Tags' + '-'.repeat(10));
         this.output.appendLine(`${cmd} ${args.join(' ')}`);

Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,11 @@ export class Generator implements vscode.Disposable {`
`42`	`42`	`if (path.dirname(outputFile) === source.directory) {`
`43`	`43`	`outputFile = path.basename(outputFile);`
`44`	`44`	`}`
`45`		- outputFile = outputFile.indexOf(' ') > 0 ? `"${outputFile}"` : outputFile;
`46`	`45`	`const outputDir = path.dirname(outputFile);`
`47`	`46`	`if (!fs.existsSync(outputDir)){`
`48`	`47`	`fs.mkdirSync(outputDir);`
`49`	`48`	`}`
	`49`	+ outputFile = outputFile.indexOf(' ') > 0 ? `"${outputFile}"` : outputFile;
`50`	`50`	args.push(`-o ${outputFile}`, '.');
`51`	`51`	`this.output.appendLine('-'.repeat(10) + 'Generating Tags' + '-'.repeat(10));`
`52`	`52`	this.output.appendLine(`${cmd} ${args.join(' ')}`);