help provider (for local help)

DonJayamanne · DonJayamanne · commit 9a0194d4fb26 · 2016-09-29T14:38:11.000+10:00
diff --git a/package.json b/package.json
@@ -45,7 +45,8 @@
     "onCommand:python.execSelectionInTerminal",
     "onCommand:jupyter.runSelectionLine",
     "onCommand:jupyter.execCurrentCell",
-    "onCommand:jupyter.execCurrentCellAndAdvance"
+    "onCommand:jupyter.execCurrentCellAndAdvance",
+    "onCommand:python.displayHelp"
   ],
   "main": "./out/client/extension",
   "contributes": {
@@ -130,6 +131,11 @@
         "command": "jupyter:gotToNextCell",
         "title": "Go to next cell",
         "category": "Jupyter"
+      },
+      {
+        "command": "python.displayHelp",
+        "title": "Help",
+        "category": "Python"
       }
     ],
     "menus": {
@@ -789,4 +795,4 @@
     "vscode": "^0.11.0",
     "webpack": "^1.13.2"
   }
-}
+}
diff --git a/src/client/common/constants.ts b/src/client/common/constants.ts
@@ -73,9 +73,10 @@ export namespace LinterErrors {
 }
 
 export namespace Documentation {
+    export const Home = '/docs/python-path/';
     export namespace Jupyter {
-        export const GettingStarted = "/docs/jupyter_getting-started/";
-        export const Examples = "/docs/jupyter_examples/";
-        export const Setup = "/docs/jupyter_prerequisites/";
+        export const GettingStarted = '/docs/jupyter_getting-started/';
+        export const Examples = '/docs/jupyter_examples/';
+        export const Setup = '/docs/jupyter_prerequisites/';
     }
 }
diff --git a/src/client/helpProvider.ts b/src/client/helpProvider.ts
@@ -5,10 +5,11 @@ import {Disposable} from 'vscode';
 import * as path from 'path';
 import * as http from 'http';
 import {createDeferred} from './common/helpers';
+import {Documentation} from './common/constants';
 const nodeStatic = require('node-static');
 
 let serverAddress = "http://localhost:8080";
-let helpPageToDisplay = "/docs/jupyter/";
+let helpPageToDisplay = Documentation.Home;
 export class TextDocumentContentProvider extends Disposable implements vscode.TextDocumentContentProvider {
     private _onDidChange = new vscode.EventEmitter<vscode.Uri>();
     private lastUri: vscode.Uri;
@@ -49,11 +50,18 @@ export class HelpProvider {
     private disposables: Disposable[] = [];
     constructor() {
         const textProvider = new TextDocumentContentProvider();
-        this.disposables.push(vscode.workspace.registerTextDocumentContentProvider(helpSchema, textProvider));
+        this.disposables.push(vscode.workspace.registerTextDocumentContentProvider(helpSchema, textProvider));        
         this.disposables.push(vscode.commands.registerCommand('python.displayHelp', (page: string) => {
             this.startServer().then(port => {
-                helpPageToDisplay = page;
-                vscode.commands.executeCommand('vscode.previewHtml', previewUri, vscode.ViewColumn.Two, 'Help');
+                let viewColumn = vscode.ViewColumn.Two;
+                if (!page || typeof page !== 'string' || page.length === 0) {
+                    helpPageToDisplay = Documentation.Home;
+                    viewColumn = vscode.ViewColumn.One;
+                }
+                else {
+                    helpPageToDisplay = page;
+                }
+                vscode.commands.executeCommand('vscode.previewHtml', previewUri, viewColumn, 'Help');
             });
         }));
     }

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,10 @@ export namespace LinterErrors {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`export namespace Documentation {`
	`76`	`+ export const Home = '/docs/python-path/';`
`76`	`77`	`export namespace Jupyter {`
`77`		`- export const GettingStarted = "/docs/jupyter_getting-started/";`
`78`		`- export const Examples = "/docs/jupyter_examples/";`
`79`		`- export const Setup = "/docs/jupyter_prerequisites/";`
	`78`	`+ export const GettingStarted = '/docs/jupyter_getting-started/';`
	`79`	`+ export const Examples = '/docs/jupyter_examples/';`
	`80`	`+ export const Setup = '/docs/jupyter_prerequisites/';`
`80`	`81`	`}`
`81`	`82`	`}`