Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Release 0.9.1 (#458)
  Add localization for Japanese (#434)
  Add Svn to uriSchemesToIgnore (#443)

Author: DonJayamanne

CHANGELOG.md

@@ -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 を実行"
+}

README.md

@@ -114,7 +114,7 @@ def handle_exception(exc_type, exc_value, exc_tb):
     tb = traceback.extract_tb(exc_tb)
     for i in [0, -1]:
         while tb:
-            frame_file = path.normcase(tb[i][0])
+            frame_file = os.path.normcase(tb[i][0])
             if not any(is_same_py_file(frame_file, f) for f in do_not_debug):
                 break
             del tb[i]

package.nls.ja.json

@@ -1,5 +1,4 @@
 import * as fs from 'fs-extra';
-import 'reflect-metadata';
 import { PathUtils } from './platform/pathUtils';
 import { EnvironmentVariablesService } from './variables/environment';
 import { EnvironmentVariables } from './variables/types';

pythonFiles/PythonTools/visualstudio_py_launcher_nodebug.py

@@ -3,7 +3,6 @@
 
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
-import 'reflect-metadata';
 import { Uri } from 'vscode';
 import { ICondaLocatorService, IInterpreterLocatorService, INTERPRETER_LOCATOR_SERVICE, InterpreterType } from '../../interpreter/contracts';
 import { CONDA_RELATIVE_PY_PATH } from '../../interpreter/locators/services/conda';

src/client/common/envFileParser.ts

@@ -1,7 +1,6 @@
 import { inject, injectable, named } from 'inversify';
 import * as os from 'os';
 import * as path from 'path';
-import 'reflect-metadata';
 import { ConfigurationTarget, QuickPickItem, Uri, window, workspace } from 'vscode';
 import * as vscode from 'vscode';
 import { IFormatterHelper } from '../../formatters/types';

src/client/common/installer/condaInstaller.ts

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 import { injectable } from 'inversify';
-import 'reflect-metadata';
 import { Uri } from 'vscode';
 import { IServiceContainer } from '../../ioc/types';
 import { PythonSettings } from '../configSettings';

src/client/common/installer/installer.ts

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 import { inject, injectable } from 'inversify';
-import 'reflect-metadata';
 import { Uri, workspace } from 'vscode';
 import { IServiceContainer } from '../../ioc/types';
 import { IPythonExecutionFactory } from '../process/types';

src/client/common/installer/moduleInstaller.ts

@@ -1,5 +1,4 @@
 import { injectable } from 'inversify';
-import 'reflect-metadata';
 import { ILogger } from './types';
 
 const PREFIX = 'Python Extension: ';

src/client/common/installer/pipInstaller.ts

@@ -4,7 +4,6 @@
 'use strict';
 
 import { inject, injectable, named } from 'inversify';
-import 'reflect-metadata';
 import { Memento } from 'vscode';
 import { GLOBAL_MEMENTO, IMemento, IPersistentState, IPersistentStateFactory, WORKSPACE_MEMENTO } from './types';
 

src/client/common/logger.ts

@@ -1,5 +1,4 @@
 import { inject, injectable } from 'inversify';
-import 'reflect-metadata';
 import { IPathUtils, IsWindows } from '../types';
 import { NON_WINDOWS_PATH_VARIABLE_NAME, WINDOWS_PATH_VARIABLE_NAME } from './constants';
 

src/client/common/persistentState.ts

@@ -1,5 +1,4 @@
 import { injectable } from 'inversify';
-import 'reflect-metadata';
 import * as Registry from 'winreg';
 import { Architecture, IRegistry, RegistryHive } from './types';
 

src/client/common/platform/pathUtils.ts

@@ -3,7 +3,6 @@
 
 import * as iconv from 'iconv-lite';
 import { injectable } from 'inversify';
-import 'reflect-metadata';
 import { DEFAULT_ENCODING } from './constants';
 import { IBufferDecoder } from './types';
 

src/client/common/platform/registry.ts

@@ -3,7 +3,6 @@
 
 import { spawn } from 'child_process';
 import { inject, injectable } from 'inversify';
-import 'reflect-metadata';
 import * as Rx from 'rxjs';
 import { Disposable } from 'vscode';
 import { createDeferred } from '../helpers';

src/client/common/process/decoder.ts

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 import { inject, injectable } from 'inversify';
-import 'reflect-metadata';
 import { Uri } from 'vscode';
 import { PythonSettings } from '../configSettings';
 import { IEnvironmentVariablesProvider } from '../variables/types';

src/client/common/process/proc.ts

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 import { injectable } from 'inversify';
-import 'reflect-metadata';
 import { ErrorUtils } from '../errors/errorUtils';
 import { ModuleNotInstalledError } from '../errors/moduleNotInstalledError';
 import { EnvironmentVariables } from '../variables/types';

src/client/common/process/pythonExecutionFactory.ts

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-// tslint:disable-next-line:no-import-side-effect
-import 'reflect-metadata';
 import { IServiceManager } from '../../ioc/types';
 import { BufferDecoder } from './decoder';
 import { ProcessService } from './proc';

src/client/common/process/pythonProcess.ts

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import 'reflect-metadata';
 import { IServiceManager } from '../ioc/types';
 import { CondaInstaller } from './installer/condaInstaller';
 import { Installer } from './installer/installer';

src/client/common/process/serviceRegistry.ts

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 import { inject, injectable } from 'inversify';
-import 'reflect-metadata';
 import { Disposable, Terminal, Uri, window, workspace } from 'vscode';
 import { IServiceContainer } from '../../ioc/types';
 import { IDisposableRegistry, IsWindows } from '../types';

src/client/common/serviceRegistry.ts

@@ -4,7 +4,6 @@
 import * as fs from 'fs-extra';
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
-import 'reflect-metadata';
 import { IPathUtils } from '../types';
 import { EnvironmentVariables, IEnvironmentVariablesService } from './types';
 

src/client/common/terminal/service.ts

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 import { inject, injectable } from 'inversify';
-import 'reflect-metadata';
 import { Disposable, FileSystemWatcher, Uri, workspace } from 'vscode';
 import { PythonSettings } from '../configSettings';
 import { NON_WINDOWS_PATH_VARIABLE_NAME, WINDOWS_PATH_VARIABLE_NAME } from '../platform/constants';

src/client/common/variables/environment.ts

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-// tslint:disable-next-line:no-import-side-effect
-import 'reflect-metadata';
 import { IServiceManager } from '../../ioc/types';
 import { EnvironmentVariablesService } from './environment';
 import { EnvironmentVariablesProvider } from './environmentVariablesProvider';

src/client/common/variables/environmentVariablesProvider.ts

@@ -1,8 +1,12 @@
 "use strict";
 
+// This line should always be right on top.
+if (Reflect.metadata === undefined) {
+    // tslint:disable-next-line:no-require-imports no-var-requires
+    require('reflect-metadata');
+}
 import * as fs from "fs";
 import * as path from "path";
-import 'reflect-metadata';
 import { DebugSession, Handles, InitializedEvent, OutputEvent, Scope, Source, StackFrame, StoppedEvent, TerminatedEvent, Thread } from "vscode-debugadapter";
 import { ThreadEvent } from "vscode-debugadapter";
 import { DebugProtocol } from "vscode-debugprotocol";

src/client/common/variables/serviceRegistry.ts

@@ -1,4 +1,9 @@
 'use strict';
+// This line should always be right on top.
+if (Reflect.metadata === undefined) {
+    // tslint:disable-next-line:no-require-imports no-var-requires
+    require('reflect-metadata');
+}
 import { Container } from 'inversify';
 import * as os from 'os';
 import * as vscode from 'vscode';

src/client/debugger/Main.ts

@@ -3,7 +3,6 @@
 
 import { injectable } from 'inversify';
 import * as path from 'path';
-import 'reflect-metadata';
 import { Uri } from 'vscode';
 import { IFormattingSettings, PythonSettings } from '../common/configSettings';
 import { ExecutionInfo, Product } from '../common/types';

src/client/extension.ts

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import 'reflect-metadata';
 import { IServiceManager } from '../ioc/types';
 import { FormatterHelper } from './helper';
 import { IFormatterHelper } from './types';

src/client/formatters/helper.ts

@@ -1,6 +1,5 @@
 import * as child_process from 'child_process';
 import { injectable } from 'inversify';
-import 'reflect-metadata';
 import { getInterpreterVersion } from '../common/utils';
 import { IInterpreterVersionService } from './contracts';
 

src/client/formatters/serviceRegistry.ts

@@ -1,7 +1,6 @@
 import { inject, injectable } from 'inversify';
 import * as _ from 'lodash';
 import * as path from 'path';
-import 'reflect-metadata';
 import { Uri } from 'vscode';
 import { fsExistsAsync, IS_WINDOWS } from '../../../common/utils';
 import { IInterpreterLocatorService, IInterpreterVersionService, IKnownSearchPathsForInterpreters, InterpreterType } from '../../contracts';

src/client/interpreter/interpreterVersion.ts

@@ -1,7 +1,6 @@
 import * as fs from 'fs-extra';
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
-import 'reflect-metadata';
 import { Uri } from 'vscode';
 import { IS_WINDOWS } from '../../../common/configSettings';
 import {

src/client/interpreter/locators/services/KnownPathsService.ts

@@ -2,7 +2,6 @@ import * as child_process from 'child_process';
 import * as fs from 'fs-extra';
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
-import 'reflect-metadata';
 import { Uri } from 'vscode';
 import { VersionUtils } from '../../../common/versionUtils';
 import { ICondaLocatorService, IInterpreterLocatorService, IInterpreterVersionService, InterpreterType, PythonInterpreter } from '../../contracts';

src/client/interpreter/locators/services/condaEnvFileService.ts

@@ -2,7 +2,6 @@ import * as child_process from 'child_process';
 import * as fs from 'fs-extra';
 import { inject, injectable, named, optional } from 'inversify';
 import * as path from 'path';
-import 'reflect-metadata';
 import { IProcessService } from '../../../common/process/types';
 import { IsWindows } from '../../../common/types';
 import { VersionUtils } from '../../../common/versionUtils';

src/client/interpreter/locators/services/condaEnvService.ts

@@ -2,7 +2,6 @@ import * as child_process from 'child_process';
 import { inject, injectable } from 'inversify';
 import * as _ from 'lodash';
 import * as path from 'path';
-import 'reflect-metadata';
 import { Uri } from 'vscode';
 import { PythonSettings } from '../../../common/configSettings';
 import { IInterpreterLocatorService, IInterpreterVersionService, InterpreterType } from '../../contracts';

src/client/interpreter/locators/services/condaLocator.ts

@@ -1,7 +1,6 @@
 import { inject, injectable } from 'inversify';
 import * as _ from 'lodash';
 import * as path from 'path';
-import 'reflect-metadata';
 import { Uri, workspace } from 'vscode';
 import { fsReaddirAsync, IS_WINDOWS } from '../../../common/utils';
 import { IInterpreterLocatorService, IInterpreterVersionService, IKnownSearchPathsForVirtualEnvironments, InterpreterType, PythonInterpreter } from '../../contracts';

src/client/interpreter/locators/services/currentPathService.ts

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import 'reflect-metadata';
 import { IsWindows } from '../common/types';
 import { IServiceManager } from '../ioc/types';
 import {

src/client/interpreter/locators/services/virtualEnvService.ts

@@ -1,6 +1,5 @@
 import { injectable } from 'inversify';
 import * as path from 'path';
-import 'reflect-metadata';
 import { fsExistsAsync } from '../../common/utils';
 import { InterpreterType } from '../contracts';
 import { IVirtualEnvironmentIdentifier } from './types';

src/client/interpreter/serviceRegistry.ts

@@ -1,6 +1,5 @@
 import { injectable } from 'inversify';
 import * as path from 'path';
-import 'reflect-metadata';
 import { fsExistsAsync } from '../../common/utils';
 import { InterpreterType } from '../contracts';
 import { IVirtualEnvironmentIdentifier } from './types';

src/client/interpreter/virtualEnvs/venv.ts

@@ -1,6 +1,5 @@
 import { injectable } from 'inversify';
 import * as path from 'path';
-import 'reflect-metadata';
 import { Uri } from 'vscode';
 import { ILintingSettings, PythonSettings } from '../common/configSettings';
 import { ExecutionInfo, Product } from '../common/types';

src/client/interpreter/virtualEnvs/virtualEnv.ts

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import 'reflect-metadata';
 import { IServiceManager } from '../ioc/types';
 import { LinterHelper } from './helper';
 import { ILinterHelper } from './types';

src/client/linters/helper.ts

@@ -22,7 +22,7 @@ import * as pylint from './../linters/pylint';
 // tslint:disable-next-line:no-require-imports no-var-requires
 const Minimatch = require('minimatch').Minimatch;
 
-const uriSchemesToIgnore = ['git', 'showModifications'];
+const uriSchemesToIgnore = ['git', 'showModifications', 'svn'];
 const lintSeverityToVSSeverity = new Map<linter.LintMessageSeverity, vscode.DiagnosticSeverity>();
 lintSeverityToVSSeverity.set(linter.LintMessageSeverity.Error, vscode.DiagnosticSeverity.Error);
 lintSeverityToVSSeverity.set(linter.LintMessageSeverity.Hint, vscode.DiagnosticSeverity.Hint);

src/client/linters/serviceRegistry.ts

@@ -1,7 +1,6 @@
 import * as getFreePort from 'get-port';
 import { inject, injectable } from 'inversify';
 import * as os from 'os';
-import 'reflect-metadata';
 import { debug, Uri, workspace } from 'vscode';
 import { PythonSettings } from '../../common/configSettings';
 import { IPythonExecutionFactory } from '../../common/process/types';

src/client/providers/lintProvider.ts

@@ -1,5 +1,4 @@
 import { inject, injectable } from 'inversify';
-import 'reflect-metadata';
 import { Disposable, Uri, workspace } from 'vscode';
 import { IDisposableRegistry } from '../../../common/types';
 import { ITestCollectionStorageService, Tests } from './../types';

src/client/unittests/common/debugLauncher.ts

@@ -1,5 +1,4 @@
 import { inject, injectable, named } from 'inversify';
-import 'reflect-metadata';
 import { TestResultResetVisitor } from './../testVisitors/resultResetVisitor';
 import { ITestResultsService, ITestVisitor, TestFile, TestFolder, Tests, TestStatus, TestSuite } from './../types';
 

src/client/unittests/common/services/storageService.ts

@@ -1,5 +1,4 @@
 import { inject, injectable, named } from 'inversify';
-import 'reflect-metadata';
 import { Disposable, OutputChannel, Uri, workspace } from 'vscode';
 import { IDisposableRegistry, IOutputChannel } from '../../../common/types';
 import { TEST_OUTPUT_CHANNEL } from './../constants';

src/client/unittests/common/services/testResultsService.ts

@@ -1,6 +1,5 @@
 import { inject, injectable, named } from 'inversify';
 import * as path from 'path';
-import 'reflect-metadata';
 import * as vscode from 'vscode';
 import { Uri, workspace } from 'vscode';
 import { window } from 'vscode';