Merge remote-tracking branch 'upstream/master'

* upstream/master: Fix typo in completion details (#396) Fix encoding (#394)

Author: DonJayamanne

package-lock.json

@@ -22,6 +22,9 @@ export class ProcessService implements IProcessService {
 
  // Always ensure we have unbuffered output.
  spawnOptions.env.PYTHONUNBUFFERED = '1';
+ if (!spawnOptions.env.PYTHONIOENCODING) {
+ spawnOptions.env.PYTHONIOENCODING = 'utf-8';
+ }
 
  const proc = spawn(file, args, spawnOptions);
  let procExited = false;
@@ -78,7 +81,9 @@ export class ProcessService implements IProcessService {
 
  // Always ensure we have unbuffered output.
  spawnOptions.env.PYTHONUNBUFFERED = '1';
-
+ if (!spawnOptions.env.PYTHONIOENCODING) {
+ spawnOptions.env.PYTHONIOENCODING = 'utf-8';
+ }
  const proc = spawn(file, args, spawnOptions);
  const deferred = createDeferred<ExecutionResult<string>>();
  const disposables: Disposable[] = [];

src/client/common/process/proc.ts

@@ -117,7 +117,7 @@ export class ItemInfoSource {
  }
 
  const descriptionWithHighlightedCode = this.highlightCode(dnd[1]);
- const tooltip = new vscode.MarkdownString(['y```python', signature, '```', descriptionWithHighlightedCode].join(EOL));
+ const tooltip = new vscode.MarkdownString(['```python', signature, '```', descriptionWithHighlightedCode].join(EOL));
  infos.push(new LanguageItemInfo(tooltip, dnd[0], new vscode.MarkdownString(dnd[1])));
 
  const key = signature + lines.join('');

src/client/providers/itemInfoSource.ts

@@ -32,6 +32,16 @@ suite('ProcessService', () => {
  expect(result.stderr).to.equal(undefined, 'stderr not undefined');
  });
 
+ test('exec should output print unicode characters', async () => {
+ const procService = new ProcessService(new BufferDecoder());
+ const printOutput = 'öä';
+ const result = await procService.exec(pythonPath, ['-c', `print(u"${printOutput}")`]);
+
+ expect(result).not.to.be.an('undefined', 'result is undefined');
+ expect(result.stdout.trim()).to.be.equal(printOutput, 'Invalid output');
+ expect(result.stderr).to.equal(undefined, 'stderr not undefined');
+ });
+
  test('exec should wait for completion of program with new lines', async function () {
  // tslint:disable-next-line:no-invalid-this
  this.timeout(5000);

src/test/common/process/proc.exec.test.ts

@@ -12,8 +12,7 @@ const options: MochaSetupOptions & { retries: number } = {
  ui: 'tdd',
  useColors: true,
  timeout: 25000,
- retries: 3,
- grep: 'Autocomplete'
+ retries: 3
 };
 testRunner.configure(options);
 module.exports = testRunner;