Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .gitmodules

This file was deleted.

1 change: 0 additions & 1 deletion docs
Submodule docs deleted from f37284
2 changes: 0 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ const eolFilter = [
'!**/*.{svg,exe,png,bmp,scpt,bat,cmd,cur,ttf,woff,eot,txt,md,json,yml}',
'!out/**/*',
'!images/**/*',
'!docs/**/*',
'!.vscode/**/*',
'!pythonFiles/**/*',
'!resources/**/*',
Expand All @@ -64,7 +63,6 @@ const tslintFilter = [
'!**/node_modules/**',
'!out/**/*',
'!images/**/*',
'!docs/**/*',
'!.vscode/**/*',
'!pythonFiles/**/*',
'!resources/**/*',
Expand Down
20 changes: 5 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
"onCommand:jupyter.runSelectionLine",
"onCommand:jupyter.execCurrentCell",
"onCommand:jupyter.execCurrentCellAndAdvance",
"onCommand:python.displayHelp",
"onCommand:python.buildWorkspaceSymbols",
"onCommand:python.updateSparkLibrary",
"onCommand:python.startREPL",
Expand Down Expand Up @@ -202,11 +201,6 @@
"title": "Go to Next Cell",
"category": "Jupyter"
},
{
"command": "python.displayHelp",
"title": "Help",
"category": "Python"
},
{
"command": "python.goToPythonObject",
"title": "Go to Python Object",
Expand Down Expand Up @@ -1600,23 +1594,17 @@
"lint": "tslint src/**/*.ts -t verbose"
},
"dependencies": {
"anser": "^1.1.0",
"copy-paste": "^1.3.0",
"diff-match-patch": "^1.0.0",
"fs-extra": "^4.0.2",
"fuzzy": "^0.1.3",
"line-by-line": "^0.1.5",
"lodash": "^4.17.4",
"minimatch": "^3.0.3",
"named-js-regexp": "^1.3.1",
"node-static": "^0.7.9",
"prepend-file": "^1.3.0",
"rx": "^4.1.0",
"semver": "^5.4.1",
"socket.io": "^1.4.8",
"tmp": "0.0.29",
"transformime": "^3.1.2",
"transformime-marked": "0.0.1",
"tree-kill": "^1.1.0",
"uint64be": "^1.0.1",
"untildify": "^3.0.2",
Expand All @@ -1626,8 +1614,7 @@
"vscode-languageclient": "^3.1.0",
"vscode-languageserver": "^3.1.0",
"winreg": "^1.2.4",
"xml2js": "^0.4.17",
"vscode": "^1.1.5"
"xml2js": "^0.4.17"
},
"devDependencies": {
"@types/chai": "^4.0.4",
Expand Down Expand Up @@ -1660,12 +1647,15 @@
"relative": "^3.0.2",
"retyped-diff-match-patch-tsd-ambient": "^1.0.0-0",
"sinon": "^2.3.6",
"transformime": "^3.1.2",
"transformime-marked": "0.0.1",
"ts-loader": "^2.3.4",
"tslint": "^5.7.0",
"tslint-eslint-rules": "^4.1.1",
"tslint-microsoft-contrib": "^5.0.1",
"typescript": "^2.5.2",
"typescript-formatter": "^6.0.0",
"webpack": "^1.13.2"
"webpack": "^1.13.2",
"vscode": "^1.1.5"
}
}
17 changes: 0 additions & 17 deletions src/client/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,3 @@ export namespace LinterErrors {
export const InvalidSyntax = 'E999';
}
}

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 VersionIncompatiblity = '/docs/troubleshooting_jupyter/#Incompatible-dependencies';
}
export namespace Formatting {
export const FormatOnSave = '/docs/formatting/';
}
export namespace Workspace {
export const Home = '/docs/workspaceSymbols/';
export const InstallOnWindows = '/docs/workspaceSymbols/#Install-Windows';
}
}
6 changes: 0 additions & 6 deletions src/client/extension.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
'use strict';

import * as fs from 'fs';
import * as os from 'os';
import { workspace } from 'vscode';
import * as vscode from 'vscode';
import * as settings from './common/configSettings';
import { Commands } from './common/constants';
import { createDeferred } from './common/helpers';
import * as telemetryHelper from './common/telemetry';
import * as telemetryContracts from './common/telemetryContracts';
import { SimpleConfigurationProvider } from './debugger';
import { HelpProvider } from './helpProvider';
import { InterpreterManager } from './interpreter';
import { SetInterpreterProvider } from './interpreter/configuration/setInterpreterProvider';
import { ShebangCodeLensProvider } from './interpreter/display/shebangCodeLensProvider';
Expand Down Expand Up @@ -142,9 +139,6 @@ export async function activate(context: vscode.ExtensionContext) {
const triggerCharacters: string[] = os.EOL.split('');
triggerCharacters.shift();

const hepProvider = new HelpProvider();
context.subscriptions.push(hepProvider);

context.subscriptions.push(vscode.debug.registerDebugConfigurationProvider('python', new SimpleConfigurationProvider()));
activationDeferred.resolve();
}
Expand Down
113 changes: 0 additions & 113 deletions src/client/helpProvider.ts

This file was deleted.

8 changes: 2 additions & 6 deletions src/client/jupyter/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { Commands, PythonLanguage } from '../common/constants';
import { JupyterCodeLensProvider } from './editorIntegration/codeLensProvider';
import { JupyterSymbolProvider } from './editorIntegration/symbolProvider';
import { formatErrorForLogging } from '../common/utils';
import { Documentation } from '../common/constants';
// import * as telemetryHelper from '../common/telemetry';
// import * as telemetryContracts from '../common/telemetryContracts';
import * as main from './jupyter_client/main';
Expand Down Expand Up @@ -147,10 +146,7 @@ export class Jupyter extends vscode.Disposable {
}).catch(reason => {
const message = typeof reason === 'string' ? reason : reason.message;
this.outputChannel.appendLine(formatErrorForLogging(reason));
vscode.window.showErrorMessage(message, 'Help', 'View Errors').then(item => {
if (item === 'Help') {
vscode.commands.executeCommand('python.displayHelp', Documentation.Jupyter.Setup);
}
vscode.window.showErrorMessage(message, 'View Errors').then(item => {
if (item === 'View Errors') {
this.outputChannel.show();
}
Expand Down Expand Up @@ -230,4 +226,4 @@ export class Jupyter extends vscode.Disposable {
this.onKernelChanged();
}));
}
};
};
40 changes: 0 additions & 40 deletions src/client/providers/codeActionProvider.ts

This file was deleted.

3 changes: 1 addition & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"src/server/node_modules",
"src/client/node_modules",
"src/server/src/typings",
"src/client/src/typings",
"docs"
"src/client/src/typings"
]
}