fixes to json deserialization · bobwalker99/vscode-python@6c7a0eb · GitHub

bobwalker99 / vscode-python Public

forked from microsoft/vscode-python

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 6c7a0eb

Browse filesBrowse the repository at this point in the historyBrowse files

DonJayamanne

committed

fixes to json deserialization

1 parent f3c454c commit 6c7a0eb
Copy full SHA for 6c7a0eb

2 files changed

+12-6Lines changed: 12 additions & 6 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• pythonFiles
  • refactor.py
• src/client/refactor
  • proxy.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎pythonFiles/refactor.py‎

Copy file name to clipboardExpand all lines: pythonFiles/refactor.py

+7-1Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -244,7 +244,13 @@ def watch(self):
244	244	try:
245	245	self._process_request(self._input.readline())
246	246	except Exception as ex:
247		- message = ex.message + ' \n' + traceback.format_exc()
	247	+ message = ""
	248	+ try:
	249	+ message = ex.message
	250	+ except:
	251	+ pass
	252	+
	253	+ message = message + ' \n' + traceback.format_exc()
248	254	sys.stderr.write('$ERROR' + str(len(message)) + ':' + message)
249	255	sys.stderr.flush()
250	256

Collapse file

‎src/client/refactor/proxy.ts‎

Copy file name to clipboardExpand all lines: src/client/refactor/proxy.ts

+5-5Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -36,13 +36,13 @@ export class RefactorProxy extends vscode.Disposable {
36	36	this._process = null;
37	37	}
38	38	extractVariable<T>(document: vscode.TextDocument, name: string, filePath: string, range: vscode.Range): Promise<T> {
39		- let command = `{"lookup":"extract_variable", "file":"${filePath}", "start":"${document.offsetAt(range.start)}", "end":"${document.offsetAt(range.end)}", "id":"1", "name":"${name}"}`;
40		- return this.sendCommand<T>(command, REFACTOR.ExtractVariable);
	39	+ let command = {"lookup":"extract_variable", "file":`"${filePath}"`, "start":document.offsetAt(range.start).toString(), "end":document.offsetAt(range.end).toString(), "id":"1", "name":`"${name}"`};
	40	+ return this.sendCommand<T>(JSON.stringify(command), REFACTOR.ExtractVariable);
41	41	}
42	42	extractMethod<T>(document: vscode.TextDocument, name: string, filePath: string, range: vscode.Range): Promise<T> {
43		- let command = `{"lookup":"extract_method", "file":"${filePath}", "start":"${document.offsetAt(range.start)}", "end":"${document.offsetAt(range.end)}", "id":"1","name":"${name}"}`;
44		- return this.sendCommand<T>(command, REFACTOR.ExtractVariable);
45		- }
	43	+ let command = {"lookup":"extract_method", "file":`"${filePath}"`, "start":document.offsetAt(range.start).toString(), "end":document.offsetAt(range.end).toString(), "id":"1","name":`"${name}"`};
	44	+ return this.sendCommand<T>(JSON.stringify(command), REFACTOR.ExtractVariable);
	45	+ }
46	46	private sendCommand<T>(command: string, telemetryEvent: string): Promise<T> {
47	47	let timer = new Delays();
48	48	return this.initialize(this.pythonSettings.pythonPath).then(() => {

0 commit comments

Comments

0 (0)