Merge branch 'master' into Release-0.9.1

Author: DonJayamanne

README.md

@@ -89,6 +89,8 @@ contributors (if you would like to contribute a translation, see the
 [pull request which added simplified Chinese](https://github.com/Microsoft/vscode-python/pull/240)):
 
 * `en`
+* `ja`
+* `ru`
 * `zh-cn`
 
 ## Data/Telemetry

package-lock.json

@@ -2,7 +2,7 @@
 "name": "python",
 "displayName": "Python",
 "description": "Linting, Debugging (multi-threaded, remote), Intellisense, code formatting, refactoring, unit tests, snippets, and more.",
-"version": "0.9.1",
+"version": "2018.1.0-alpha",
 "publisher": "ms-python",
 "author": {
 "name": "Microsoft Corporation"
@@ -627,6 +627,16 @@
 "type": "string",
 "description": "Absolute path to a file containing environment variable definitions.",
 "default": ""
+},
+"port": {
+"type": "number",
+"description": "Debug port (default is 0, resulting in the use of a dynamic port).",
+"default": 0
+},
+"host": {
+"type": "string",
+"description": "IP address of the of the local debug server (default is localhost).",
+"default": "localhost"
 }
 }
 },
@@ -1321,6 +1331,12 @@
 "description": "Port number used for debugging of unittests.",
 "scope": "resource"
 },
+"python.unitTest.debugHost": {
+"type": "number",
+"default": "localhost",
+"description": "IP Address of the of the local unit test server (default is localhost or use 127.0.0.1).",
+"scope": "resource"
+},
 "python.unitTest.cwd": {
 "type": "string",
 "default": null,
@@ -1506,6 +1522,7 @@
 "lint": "tslint src/**/*.ts -t verbose"
 },
 "dependencies": {
+"arch": "^2.1.0",
 "diff-match-patch": "^1.0.0",
 "fs-extra": "^4.0.2",
 "fuzzy": "^0.1.3",
@@ -1567,6 +1584,7 @@
 "tslint-microsoft-contrib": "^5.0.1",
 "typescript": "^2.6.2",
 "typescript-formatter": "^6.0.0",
-"vscode": "^1.1.5"
+"vscode": "^1.1.5",
+"vscode-debugadapter-testsupport": "^1.25.0"
 }
 }

package.json

@@ -0,0 +1,50 @@
+{
+ "python.command.python.sortImports.title": "import 文を並び替える",
+ "python.command.python.startREPL.title": "REPL を開始",
+ "python.command.python.buildWorkspaceSymbols.title": "ワークスペースのシンボルをビルド",
+ "python.command.python.runtests.title": "すべての単体テストを実行",
+ "python.command.python.debugtests.title": "すべての単体テストをデバッグ",
+ "python.command.python.execInTerminal.title": "ターミナルで Python ファイルを実行",
+ "python.command.python.setInterpreter.title": "インタープリターを選択",
+ "python.command.python.updateSparkLibrary.title": "ワークスペース PySpark ライブラリを更新",
+ "python.command.python.refactorExtractVariable.title": "変数を抽出",
+ "python.command.python.refactorExtractMethod.title": "メソッドを抽出",
+ "python.command.python.viewTestOutput.title": "単体テストの出力を表示",
+ "python.command.python.selectAndRunTestMethod.title": "単体テストメソッドを実行...",
+ "python.command.python.selectAndDebugTestMethod.title": "単体テストメソッドをデバッグ...",
+ "python.command.python.selectAndRunTestFile.title": "単体テストファイルを実行...",
+ "python.command.python.runCurrentTestFile.title": "現在の単体テストファイルを実行",
+ "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",
+"python.snippet.launch.standard.description": "標準出力で Python プログラムをデバッグ",
+"python.snippet.launch.pyspark.label": "Python: PySpark",
+"python.snippet.launch.pyspark.description": "PySpark をデバッグ",
+"python.snippet.launch.module.label": "Python: モジュール",
+"python.snippet.launch.module.description": "Python モジュールをデバッグ",
+"python.snippet.launch.terminal.label": "Python: ターミナル (統合)",
+"python.snippet.launch.terminal.description": "統合ターミナル/コンソールで Python プログラムをデバッグ",
+"python.snippet.launch.externalTerminal.label": "Python: ターミナル (外部)",
+"python.snippet.launch.externalTerminal.description": "外部のターミナル/コンソールで Python プログラムをデバッグ",
+"python.snippet.launch.django.label": "Python: Django",
+"python.snippet.launch.django.description": "Django アプリケーションをデバッグ",
+"python.snippet.launch.flask.label": "Python: Flask (0.11.x 以降)",
+"python.snippet.launch.flask.description": "Flask アプリケーションをデバッグ",
+"python.snippet.launch.flaskOld.label": "Python: Flask (0.10.x 以前)",
+"python.snippet.launch.flaskOld.description": "旧式の Flask アプリケーションをデバッグ",
+"python.snippet.launch.pyramid.label": "Python: Pyramid アプリケーション",
+"python.snippet.launch.pyramid.description": "Pyramid アプリケーションをデバッグ",
+"python.snippet.launch.watson.label": "Python: Watson アプリケーション",
+"python.snippet.launch.watson.description": "Watson アプリケーションをデバッグ",
+"python.snippet.launch.attach.label": "Python: アタッチ",
+"python.snippet.launch.attach.description": "リモートデバッグのためにデバッガをアタッチ",
+"python.snippet.launch.scrapy.label": "Python: Scrapy",
+"python.snippet.launch.scrapy.description": "統合ターミナル/コンソールで Scrapy を実行"
+}

package.nls.ja.json

@@ -0,0 +1,50 @@
+{
+ "python.command.python.sortImports.title": "Отсортировать Imports",
+ "python.command.python.startREPL.title": "Открыть REPL",
+ "python.command.python.buildWorkspaceSymbols.title": "Собрать символы рабочего пространства",
+ "python.command.python.runtests.title": "Запустить все тесты",
+ "python.command.python.debugtests.title": "Запустить все тесты под отладчиком",
+ "python.command.python.execInTerminal.title": "Выполнить файл в консоли",
+ "python.command.python.setInterpreter.title": "Выбрать интерпретатор",
+ "python.command.python.updateSparkLibrary.title": "Обновить библиотеки PySpark",
+ "python.command.python.refactorExtractVariable.title": "Извлечь в переменную",
+ "python.command.python.refactorExtractMethod.title": "Извлечь в метод",
+ "python.command.python.viewTestOutput.title": "Показать вывод теста",
+ "python.command.python.selectAndRunTestMethod.title": "Запусть тестовый метод...",
+ "python.command.python.selectAndDebugTestMethod.title": "Отладить тестовый метод...",
+ "python.command.python.selectAndRunTestFile.title": "Запустить тестовый файл...",
+ "python.command.python.runCurrentTestFile.title": "Запустить текущий тестовый файл",
+ "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.snippet.launch.standard.label": "Python",
+"python.snippet.launch.standard.description": "Отладить программу Python со стандартным выводом",
+"python.snippet.launch.pyspark.label": "Python: PySpark",
+"python.snippet.launch.pyspark.description": "Отладка PySpark",
+"python.snippet.launch.module.label": "Python: Модуль",
+"python.snippet.launch.module.description": "Отладка модуля",
+"python.snippet.launch.terminal.label": "Python: Интегрированная консоль",
+"python.snippet.launch.terminal.description": "Отладка программы Python в интегрированной консоли",
+"python.snippet.launch.externalTerminal.label": "Python: Внешний терминал",
+"python.snippet.launch.externalTerminal.description": "Отладка программы Python во внешней консоли",
+"python.snippet.launch.django.label": "Python: Django",
+"python.snippet.launch.django.description": "Отладка приложения Django",
+"python.snippet.launch.flask.label": "Python: Flask (0.11.x или новее)",
+"python.snippet.launch.flask.description": "Отладка приложения Flask",
+"python.snippet.launch.flaskOld.label": "Python: Flask (0.10.x или старее)",
+"python.snippet.launch.flaskOld.description": "Отладка приложения Flask (старый стиль)",
+"python.snippet.launch.pyramid.label": "Python: Приложение Pyramid",
+"python.snippet.launch.pyramid.description": "Отладка приложения Pyramid",
+"python.snippet.launch.watson.label": "Python: Приложение Watson",
+"python.snippet.launch.watson.description": "Отладка приложения Watson",
+"python.snippet.launch.attach.label": "Python: Подключить отладчик",
+"python.snippet.launch.attach.description": "Подключить отладчик для удаленной отладки",
+"python.snippet.launch.scrapy.label": "Python: Scrapy",
+"python.snippet.launch.scrapy.description": "Scrapy в интегрированной консоли"
+}

package.nls.ru.json

@@ -6,7 +6,6 @@
 import traceback
 import platform
 
-WORD_RE = re.compile(r'\w')
 jediPreview = False
 
 class RedirectStdout(object):
@@ -111,8 +110,6 @@ def _get_call_signatures(self, script):
  continue
  if param.name == 'self' and pos == 0:
  continue
- if WORD_RE.match(param.name) is None:
- continue
  try:
  name, value = param.description.split('=')
  except ValueError:
@@ -155,8 +152,6 @@ def _get_call_signatures_with_args(self, script):
  continue
  if param.name == 'self' and pos == 0:
  continue
- if WORD_RE.match(param.name) is None:
- continue
  try:
  name, value = param.description.split('=')
  except ValueError:

pythonFiles/completion.py

@@ -36,6 +36,7 @@ export interface ISortImportSettings {
 export interface IUnitTestSettings {
  promptToConfigure: boolean;
  debugPort: number;
+ debugHost?: string;
  nosetestsEnabled: boolean;
  nosetestPath: string;
  nosetestArgs: string[];

src/client/common/configSettings.ts

@@ -1,38 +1,34 @@
-"use strict";
-
-import * as net from "net";
 import { EventEmitter } from 'events';
+import * as net from 'net';
 import { createDeferred } from '../../helpers';
 
 export class SocketServer extends EventEmitter {
- private socketServer: net.Server = null;
+ private socketServer: net.Server | undefined;
  constructor() {
  super();
  }
 
  public Stop() {
- if (this.socketServer === null) { return; }
+ if (!this.socketServer) { return; }
  try {
  this.socketServer.close();
- }
- catch (ex) { }
- this.socketServer = null;
+  // tslint:disable-next-line:no-empty
+ } catch (ex) { }
+ this.socketServer = undefined;
  }
 
- public Start(): Promise<number> {
+ public Start(options: { port?: number, host?: string } = {}): Promise<number> {
  const def = createDeferred<number>();
  this.socketServer = net.createServer(this.connectionListener.bind(this));
 
- this.socketServer.listen(0, function (this: SocketServer) {
- def.resolve(this.socketServer.address().port);
- }.bind(this));
+ const port = typeof options.port === 'number' ? options.port! : 0;
+ const host = typeof options.host === 'string' ? options.host! : 'localhost';
+ this.socketServer!.listen({ port, host }, () => {
+ def.resolve(this.socketServer!.address().port);
+ });
 
- this.socketServer.on("error", ex => {
+ this.socketServer!.on('error', ex => {
  console.error('Error in Socket Server', ex);
- if (def.completed) {
- // Ooops
- debugger;
- }
  const msg = `Failed to start the socket server. (Error: ${ex.message})`;
 
  def.reject(msg);
@@ -41,14 +37,14 @@ export class SocketServer extends EventEmitter {
  }
 
  private connectionListener(client: net.Socket) {
- client.on("close", function () {
+ client.on('close', () => {
  this.emit('close', client);
- }.bind(this));
- client.on("data", function (data: Buffer) {
+ });
+ client.on('data', (data: Buffer) => {
  this.emit('data', client, data);
- }.bind(this));
+ });
 
- client.on("timeout", d => {
+ client.on('timeout', d => {
  // let msg = "Debugger client timedout, " + d;
  });
  }

src/client/common/net/socket/socketServer.ts

@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import * as os from 'os';
-
+import * as arch from 'arch';
 export const WINDOWS_PATH_VARIABLE_NAME = 'Path';
 export const NON_WINDOWS_PATH_VARIABLE_NAME = 'PATH';
 export const IS_WINDOWS = /^win/.test(process.platform);
-export const IS_64_BIT = os.arch() === 'x64';
+export const IS_64_BIT = arch() === 'x64';

src/client/common/platform/constants.ts

@@ -340,8 +340,8 @@ export function getSubDirectories(rootDir: string): Promise<string[]> {
  subDirs.push(fullPath);
  }
  }
- catch (ex) {
- }
+ // tslint:disable-next-line:no-empty
+ catch (ex) {}
  });
  resolve(subDirs);
  });