From 3da884037ba9023f1f8c920f6ba67d3e64a54739 Mon Sep 17 00:00:00 2001 From: Yu Zhang <583181285@qq.com> Date: Sun, 11 Mar 2018 19:09:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=A5=20remove=20jupyter=20commands?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/package.json b/package.json index 95e667811ed2..dcbf4b2e5e56 100644 --- a/package.json +++ b/package.json @@ -197,31 +197,6 @@ "title": "%python.command.python.execSelectionInDjangoShell.title%", "category": "Python" }, - { - "command": "jupyter.runSelectionLine", - "title": "%python.command.jupyter.runSelectionLine.title%", - "category": "Jupyter" - }, - { - "command": "jupyter.execCurrentCell", - "title": "%python.command.jupyter.execCurrentCell.title%", - "category": "Jupyter" - }, - { - "command": "jupyter.execCurrentCellAndAdvance", - "title": "%python.command.jupyter.execCurrentCellAndAdvance.title%", - "category": "Jupyter" - }, - { - "command": "jupyter.gotToPreviousCell", - "title": "%python.command.jupyter.gotToPreviousCell.title%", - "category": "Jupyter" - }, - { - "command": "jupyter.gotToNextCell", - "title": "%python.command.jupyter.gotToNextCell.title%", - "category": "Jupyter" - }, { "command": "python.goToPythonObject", "title": "%python.command.python.goToPythonObject.title%", From fcee20118f94353cdbfbe573f199c11f236cf885 Mon Sep 17 00:00:00 2001 From: Yu <583181285@qq.com> Date: Tue, 13 Mar 2018 01:02:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=A5=20more=20cleaning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 10 ---------- package.nls.ja.json | 5 ----- package.nls.json | 5 ----- package.nls.ko-kr.json | 5 ----- package.nls.ru.json | 5 ----- package.nls.zh-cn.json | 5 ----- package.nls.zh-tw.json | 5 ----- src/client/common/featureDeprecationManager.ts | 12 ------------ 8 files changed, 52 deletions(-) diff --git a/package.json b/package.json index dcbf4b2e5e56..aa689f7af6c2 100644 --- a/package.json +++ b/package.json @@ -75,9 +75,6 @@ "onCommand:python.runFailedTests", "onCommand:python.execSelectionInTerminal", "onCommand:python.execSelectionInDjangoShell", - "onCommand:jupyter.runSelectionLine", - "onCommand:jupyter.execCurrentCell", - "onCommand:jupyter.execCurrentCellAndAdvance", "onCommand:python.buildWorkspaceSymbols", "onCommand:python.updateSparkLibrary", "onCommand:python.startREPL", @@ -94,13 +91,6 @@ "path": "./snippets/python.json" } ], - "keybindings": [ - { - "command": "jupyter.runSelectionLine", - "key": "ctrl+alt+enter", - "when": "editorFocus && !replaceActive && !searchViewletVisible && !findWidgetVisible" - } - ], "commands": [ { "command": "python.sortImports", diff --git a/package.nls.ja.json b/package.nls.ja.json index ac60fe68e344..8b8deec49c7d 100644 --- a/package.nls.ja.json +++ b/package.nls.ja.json @@ -17,11 +17,6 @@ "python.command.python.runFailedTests.title": "失敗した単体テストを実行", "python.command.python.execSelectionInTerminal.title": "Python ターミナルで選択範囲/行を実行", "python.command.python.execSelectionInDjangoShell.title": "Django シェルで選択範囲/行を実行", - "python.command.jupyter.runSelectionLine.title": "選択範囲/行を実行", - "python.command.jupyter.execCurrentCell.title": "セルを実行", - "python.command.jupyter.execCurrentCellAndAdvance.title": "セルを実行して次へ", - "python.command.jupyter.gotToPreviousCell.title": "前のセルに移動", - "python.command.jupyter.gotToNextCell.title": "次のセルに移動", "python.command.python.goToPythonObject.title": "Python オブジェクトに移動", "python.snippet.launch.standard.label": "Python: Current File", "python.snippet.launch.standard.description": "標準出力で Python プログラムをデバッグ", diff --git a/package.nls.json b/package.nls.json index 8b9529a45bb0..f1fd181184ab 100644 --- a/package.nls.json +++ b/package.nls.json @@ -18,11 +18,6 @@ "python.command.python.runFailedTests.title": "Run Failed Unit Tests", "python.command.python.execSelectionInTerminal.title": "Run Selection/Line in Python Terminal", "python.command.python.execSelectionInDjangoShell.title": "Run Selection/Line in Django Shell", - "python.command.jupyter.runSelectionLine.title": "Run Selection/Line", - "python.command.jupyter.execCurrentCell.title": "Run Cell", - "python.command.jupyter.execCurrentCellAndAdvance.title": "Run Cell and Advance", - "python.command.jupyter.gotToPreviousCell.title": "Go to Previous Cell", - "python.command.jupyter.gotToNextCell.title": "Go to Next Cell", "python.command.python.goToPythonObject.title": "Go to Python Object", "python.command.python.setLinter.title": "Select Linter", "python.command.python.enableLinting.title": "Enable Linting", diff --git a/package.nls.ko-kr.json b/package.nls.ko-kr.json index 4901b2466fa1..c668625209f2 100644 --- a/package.nls.ko-kr.json +++ b/package.nls.ko-kr.json @@ -17,11 +17,6 @@ "python.command.python.runFailedTests.title": "실패한 단위 테스트 실행", "python.command.python.execSelectionInTerminal.title": "Python 터미널에서 선택 영역/줄 실행", "python.command.python.execSelectionInDjangoShell.title": "Django 셸에서 선택 영역/줄 실행", - "python.command.jupyter.runSelectionLine.title": "선택 영역/줄 실행", - "python.command.jupyter.execCurrentCell.title": "셀 실행", - "python.command.jupyter.execCurrentCellAndAdvance.title": "셀을 실행하고 다음", - "python.command.jupyter.gotToPreviousCell.title": "이전 셀로 이동", - "python.command.jupyter.gotToNextCell.title": "다음 셀로 이동", "python.command.python.goToPythonObject.title": " Python 객체로 이동", "python.snippet.launch.standard.label": "Python: Current File", "python.snippet.launch.standard.description": "표준 출력으로 Python 프로그램 디버그", diff --git a/package.nls.ru.json b/package.nls.ru.json index 16dea327fae1..d58dbf9b2ea1 100644 --- a/package.nls.ru.json +++ b/package.nls.ru.json @@ -17,11 +17,6 @@ "python.command.python.runFailedTests.title": "Запустить непрошедшие тесты", "python.command.python.execSelectionInTerminal.title": "Выполнить выбранный текст или текущую строку в консоли", "python.command.python.execSelectionInDjangoShell.title": "Выполнить выбранный текст или текущую строку в оболочке Django", - "python.command.jupyter.runSelectionLine.title": "Выполнить выбранный текст или текущую строку", - "python.command.jupyter.execCurrentCell.title": "Выполнить ячейку", - "python.command.jupyter.execCurrentCellAndAdvance.title": "Выполнить ячейку и перейти к следующей", - "python.command.jupyter.gotToPreviousCell.title": "Перейти к предыдущей ячейке", - "python.command.jupyter.gotToNextCell.title": "Перейти к следующей ячейке", "python.command.python.goToPythonObject.title": "Перейти к объекту Python", "python.command.python.setLinter.title": "Выбрать анализатор кода", "python.command.python.enableLinting.title": "Включить анализатор кода", diff --git a/package.nls.zh-cn.json b/package.nls.zh-cn.json index a4b88e0dfa42..b884240efa16 100644 --- a/package.nls.zh-cn.json +++ b/package.nls.zh-cn.json @@ -17,11 +17,6 @@ "python.command.python.runFailedTests.title": "运行失败的单元测试", "python.command.python.execSelectionInTerminal.title": "在 Python 终端中运行选定内容／行", "python.command.python.execSelectionInDjangoShell.title": "在 Django Shell 中运行选定内容／行", - "python.command.jupyter.runSelectionLine.title": "运行选定内容／行", - "python.command.jupyter.execCurrentCell.title": "运行当前 Cell", - "python.command.jupyter.execCurrentCellAndAdvance.title": "运行当前 Cell 并移动到下一个 Cell", - "python.command.jupyter.gotToPreviousCell.title": "转到前一个 Cell", - "python.command.jupyter.gotToNextCell.title": "转到下一个 Cell", "python.command.python.goToPythonObject.title": "转到 Python 对象", "python.snippet.launch.standard.label": "Python: Current File", "python.snippet.launch.standard.description": "使用标准输出调试 Python 应用", diff --git a/package.nls.zh-tw.json b/package.nls.zh-tw.json index 597dd0bb45ff..15011bbd2b3c 100644 --- a/package.nls.zh-tw.json +++ b/package.nls.zh-tw.json @@ -18,11 +18,6 @@ "python.command.python.runFailedTests.title": "執行失敗的單元測試", "python.command.python.execSelectionInTerminal.title": "在 Python 終端機中執行選定內容／行", "python.command.python.execSelectionInDjangoShell.title": "在 Django Shell 中執行選定內容／行", - "python.command.jupyter.runSelectionLine.title": "執行選定內容／行", - "python.command.jupyter.execCurrentCell.title": "執行當前 Cell", - "python.command.jupyter.execCurrentCellAndAdvance.title": "執行當前 Cell 並移動到下一個 Cell", - "python.command.jupyter.gotToPreviousCell.title": "跳至前一個 Cell", - "python.command.jupyter.gotToNextCell.title": "跳至下一個 Cell", "python.command.python.goToPythonObject.title": "跳至 Python 物件", "python.command.python.setLinter.title": "選擇 Linter", "python.command.python.enableLinting.title": "啟用 Linting", diff --git a/src/client/common/featureDeprecationManager.ts b/src/client/common/featureDeprecationManager.ts index 5ecd868a23be..cb318f30ff8a 100644 --- a/src/client/common/featureDeprecationManager.ts +++ b/src/client/common/featureDeprecationManager.ts @@ -18,15 +18,6 @@ type deprecatedSettingAndValue = { values?: {}[]; }; -const jupyterDeprecationInfo: deprecatedFeatureInfo = { - doNotDisplayPromptStateKey: 'SHOW_DEPRECATED_FEATURE_PROMPT_JUPYTER', - message: 'This functionality has been moved to the \'Jupyter\' extension.', - moreInfoUrl: 'https://marketplace.visualstudio.com/items?itemName=donjayamanne.jupyter', - commands: ['jupyter.runSelectionLine', 'jupyter.execCurrentCell', - 'jupyter.execCurrentCellAndAdvance', 'jupyter.gotToPreviousCell', - 'jupyter.gotToNextCell'] -}; - const deprecatedFeatures: deprecatedFeatureInfo[] = [ { doNotDisplayPromptStateKey: 'SHOW_DEPRECATED_FEATURE_PROMPT_FORMAT_ON_SAVE', @@ -53,9 +44,6 @@ export class FeatureDeprecationManager implements IFeatureDeprecationManager { this.disposables.forEach(disposable => disposable.dispose()); } public initialize() { - if (!this.jupyterExtensionInstalled) { - deprecatedFeatures.push(jupyterDeprecationInfo); - } deprecatedFeatures.forEach(this.registerDeprecation.bind(this)); } private registerDeprecation(deprecatedInfo: deprecatedFeatureInfo) {