Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Incorporated the extract method command #18518 #18514

Closed
wants to merge 122 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
9d03ae1
Fixed namespace and type errors
Harry-Hopkinson Jan 23, 2022
3255366
Fetch Jupyter Notebook Interpreters if there are multiple available a…
Harry-Hopkinson Jan 23, 2022
49fbea1
Complying types to reduce errors
Harry-Hopkinson Jan 23, 2022
29881a4
Ran prettier
Harry-Hopkinson Jan 26, 2022
f8934ca
News
Harry-Hopkinson Jan 26, 2022
d38dc6a
Merge branch 'microsoft:main' into main
Harry-Hopkinson Jan 26, 2022
d1bd21e
Used prettier on service.ts
Harry-Hopkinson Jan 26, 2022
d6e9b61
Requirements.txt for Python Action Checking
Harry-Hopkinson Jan 26, 2022
7ef27f4
Removed pr file check
Harry-Hopkinson Jan 26, 2022
5c0becb
News
Harry-Hopkinson Jan 26, 2022
9c272b9
News
Harry-Hopkinson Jan 26, 2022
a681dff
Merge branch 'main' of https://github.com/Harry-Hopkinson/vscode-python
Harry-Hopkinson Jan 26, 2022
b5d568b
Updated cffi version
Harry-Hopkinson Jan 26, 2022
4691570
Ran prettier --check 'src/client/**/*.ts' 'build/**/*.js' for Formatt…
Harry-Hopkinson Jan 26, 2022
0c66d8a
Fixed client factory error and installed react to fix eslint errors.
Harry-Hopkinson Jan 26, 2022
cd8ea46
Ran global prettier
Harry-Hopkinson Jan 26, 2022
1ab0a6f
Merge branch 'microsoft:main' into main
Harry-Hopkinson Jan 26, 2022
9319df6
Removed unused imports causing errors
Harry-Hopkinson Jan 26, 2022
c5d6b8f
Updated ciffi
Harry-Hopkinson Jan 26, 2022
25760af
Mass prettier linting
Harry-Hopkinson Jan 26, 2022
ab885a6
Removed check python formatting - it was causing errors
Harry-Hopkinson Jan 26, 2022
73480dc
Linting back
Harry-Hopkinson Jan 26, 2022
edd0633
Removed .eslintignore to fix eslint errors - can be generated again
Harry-Hopkinson Jan 26, 2022
23ae764
Added eslint back
Harry-Hopkinson Jan 26, 2022
d56718f
Merge branch 'main' into main
Harry-Hopkinson Jan 27, 2022
41c00a9
Reverted back to original changes before my commits.
Harry-Hopkinson Jan 27, 2022
0c840aa
Updated news
Harry-Hopkinson Jan 27, 2022
99fdbbd
Error message if you try to run code with no active text editor opened.
Harry-Hopkinson Jan 27, 2022
372366a
News
Harry-Hopkinson Jan 27, 2022
9cf072a
Used IApplicationShell
Harry-Hopkinson Jan 27, 2022
8fabd34
Removed unnecessary import
Harry-Hopkinson Jan 27, 2022
cadde34
Used vscode.window to stop errors.
Harry-Hopkinson Jan 27, 2022
b0689e4
Merge branch 'microsoft:main' into main
Harry-Hopkinson Jan 28, 2022
a75bc2e
Testing
Harry-Hopkinson Jan 28, 2022
db04879
Merge branch 'main' of https://github.com/Harry-Hopkinson/vscode-python
Harry-Hopkinson Jan 28, 2022
f1fc014
Return error
Harry-Hopkinson Jan 28, 2022
e2834c0
Used IApplicationShell for pop up windows. Fixed spelling mistake
Harry-Hopkinson Jan 28, 2022
b1d8354
Revered back to vscode while fixing error
Harry-Hopkinson Jan 28, 2022
f2de95c
Merge branch 'microsoft:main' into main
Harry-Hopkinson Jan 29, 2022
ba36dc8
Use IApplicationShell for Error Messages
Harry-Hopkinson Jan 29, 2022
bb99fad
Fixed promise types
Harry-Hopkinson Jan 29, 2022
f327907
Return Error
Harry-Hopkinson Jan 29, 2022
3bed574
Created new constant for message
Harry-Hopkinson Jan 29, 2022
53675ce
Return a message value
Harry-Hopkinson Jan 29, 2022
d37e387
Return the error window
Harry-Hopkinson Jan 29, 2022
7746bd8
Using active editor to remove errors while resolving errors.
Harry-Hopkinson Jan 29, 2022
9da5abf
Use appshell for errors
Harry-Hopkinson Jan 29, 2022
9e8f5b9
Use an Interface for running the error messages
Harry-Hopkinson Jan 29, 2022
a076223
Changed types
Harry-Hopkinson Jan 29, 2022
241722e
Imported window from vscode
Harry-Hopkinson Jan 29, 2022
3dd72cb
Use IAppShell to display message for testing
Harry-Hopkinson Jan 30, 2022
7ce4430
Fixed old python that fail to lint
Harry-Hopkinson Jan 30, 2022
a12c1e2
Used linting of interpreterInfo to remove error
Harry-Hopkinson Jan 30, 2022
f55d416
Full Stop
Harry-Hopkinson Jan 30, 2022
b49bc21
Formatted python Files
Harry-Hopkinson Jan 30, 2022
e2ca224
Linted Files
Harry-Hopkinson Jan 30, 2022
9d1eeac
Linting
Harry-Hopkinson Jan 30, 2022
b2ca7f7
Revert
Harry-Hopkinson Jan 30, 2022
0f60148
Revert
Harry-Hopkinson Jan 30, 2022
cfb8063
Python Files reformatted
Harry-Hopkinson Jan 30, 2022
2d1c671
Used an Interface in a type file
Harry-Hopkinson Jan 30, 2022
50bee74
Use IAppShell for testing
Harry-Hopkinson Jan 30, 2022
628a3d7
Gitignore gitpod for gitpod users
Harry-Hopkinson Jan 31, 2022
8cbeeab
Merge branch 'microsoft:main' into main
Harry-Hopkinson Feb 2, 2022
f3fe60c
Merge branch 'microsoft:main' into main
Harry-Hopkinson Feb 2, 2022
daad0b0
Merge branch 'microsoft:main' into main
Harry-Hopkinson Feb 3, 2022
9985015
Reverted
Harry-Hopkinson Feb 3, 2022
d5de719
Incorporate Testing
Harry-Hopkinson Feb 3, 2022
7919fc9
Updated prospector
Harry-Hopkinson Feb 3, 2022
fe743f5
Test
Harry-Hopkinson Feb 3, 2022
ee7d2f5
Revert
Harry-Hopkinson Feb 3, 2022
e5c3d0d
Revert
Harry-Hopkinson Feb 3, 2022
d83376f
Merge branch 'microsoft:main' into main
Harry-Hopkinson Feb 3, 2022
f7b42ec
Merge branch 'microsoft:main' into main
Harry-Hopkinson Feb 3, 2022
b2f0f77
Merge branch 'microsoft:main' into main
Harry-Hopkinson Feb 4, 2022
57ae3fc
Merge branch 'microsoft:main' into main
Harry-Hopkinson Feb 4, 2022
6ccefe3
Localised Testing
Harry-Hopkinson Feb 4, 2022
b4e622c
Merge branch 'microsoft:main' into main
Harry-Hopkinson Feb 4, 2022
bb4a9fc
Upgrade vsce
Harry-Hopkinson Feb 4, 2022
eb717fe
Revert package and package-lock.json
Harry-Hopkinson Feb 4, 2022
8084af6
Merge branch 'microsoft:main' into main
Harry-Hopkinson Feb 5, 2022
26e4da7
Remove window import
Harry-Hopkinson Feb 5, 2022
061ee5a
Create a window variable
Harry-Hopkinson Feb 5, 2022
7bceea4
Remove any types
Harry-Hopkinson Feb 5, 2022
129eea9
Import window from vscode
Harry-Hopkinson Feb 5, 2022
1f60a71
Remove unused imports
Harry-Hopkinson Feb 5, 2022
428e058
Return Types
Harry-Hopkinson Feb 5, 2022
be15659
Fixed testing
Harry-Hopkinson Feb 5, 2022
edc87c4
Await a call - not the function
Harry-Hopkinson Feb 6, 2022
3753ad1
Attempt to fix #18455
Harry-Hopkinson Feb 7, 2022
b1cf749
New line at the end of the package-lock.json
Harry-Hopkinson Feb 7, 2022
e9b1b2c
New line for package.json
Harry-Hopkinson Feb 7, 2022
9ae1827
Window message to check if Isort has been Downloaded
Harry-Hopkinson Feb 7, 2022
f0da98b
Window message
Harry-Hopkinson Feb 7, 2022
0e3c0c8
Scrapped idea of a window pop up
Harry-Hopkinson Feb 7, 2022
a65c171
Revert
Harry-Hopkinson Feb 7, 2022
656e79d
Revert
Harry-Hopkinson Feb 7, 2022
3b6fe0a
If no text pointer is found
Harry-Hopkinson Feb 7, 2022
b2964d2
Changed type
Harry-Hopkinson Feb 7, 2022
2adf0e4
Merge branch 'microsoft:main' into main
Harry-Hopkinson Feb 7, 2022
ba3429c
Revert
Harry-Hopkinson Feb 8, 2022
ceda41f
Testing
Harry-Hopkinson Feb 8, 2022
8231e1b
Ran prettier
Harry-Hopkinson Feb 8, 2022
76e03ba
Revert
Harry-Hopkinson Feb 8, 2022
b2a0e3e
Merge branch 'microsoft:main' into main
Harry-Hopkinson Feb 8, 2022
e4e59fc
Revert
Harry-Hopkinson Feb 8, 2022
f45c594
Merge branch 'main' of https://github.com/Harry-Hopkinson/vscode-python
Harry-Hopkinson Feb 8, 2022
402bb61
Remove --live-stream from conda run
Harry-Hopkinson Feb 13, 2022
660b159
Update news
Harry-Hopkinson Feb 13, 2022
d1d320c
Remove unused commands
Harry-Hopkinson Feb 13, 2022
b7d6fc4
Merge branch 'microsoft:main' into main
Harry-Hopkinson Feb 14, 2022
7142a3c
Add an Extract Method Command #18518
Harry-Hopkinson Feb 14, 2022
f4914e3
Fixed linting
Harry-Hopkinson Feb 14, 2022
133c9d2
Reverting
Harry-Hopkinson Feb 14, 2022
e3d8cfd
Revert --live-stream to just fix one issue
Harry-Hopkinson Feb 14, 2022
233392a
Support multiple line input and indented text
Harry-Hopkinson Feb 14, 2022
0e413c3
Updated the package-lock.json by updating dependencies..
Harry-Hopkinson Feb 14, 2022
ea65844
Use let instead of var
Harry-Hopkinson Feb 14, 2022
6d4c637
Updated test.ts to pass checks -> fix ```Import may be converted to …
Harry-Hopkinson Feb 14, 2022
2a3e749
Revert package and package-lock.json
Harry-Hopkinson Feb 14, 2022
b722e32
Fix lint errors
Harry-Hopkinson Feb 14, 2022
66a7793
Merge branch 'microsoft:main' into main
Harry-Hopkinson Feb 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Used an Interface in a type file
  • Loading branch information
Harry-Hopkinson committed Jan 30, 2022
commit 2d1c671b1d8961ffaa29f354eb3cf711e8336283
7 changes: 2 additions & 5 deletions src/client/terminals/codeExecution/codeExecutionManager.ts
Original file line number Diff line number Diff line change
@@ -17,11 +17,7 @@ import { IServiceContainer } from '../../ioc/types';
import { traceError } from '../../logging';
import { captureTelemetry, sendTelemetryEvent } from '../../telemetry';
import { EventName } from '../../telemetry/constants';
import { ICodeExecutionHelper, ICodeExecutionManager, ICodeExecutionService } from '../../terminals/types';

interface IAppShell {
showErrorMessage(message: string, ...items: string[]): Promise<string | undefined>;
}
import { IAppShell, ICodeExecutionHelper, ICodeExecutionManager, ICodeExecutionService } from '../../terminals/types';

@injectable()
export class CodeExecutionManager implements ICodeExecutionManager {
@@ -62,6 +58,7 @@ export class CodeExecutionManager implements ICodeExecutionManager {
),
);
}

private async executeFileInTerminal(file: Resource, trigger: 'command' | 'icon') {
sendTelemetryEvent(EventName.EXECUTION_CODE, undefined, { scope: 'file', trigger });
const codeExecutionHelper = this.serviceContainer.get<ICodeExecutionHelper>(ICodeExecutionHelper);
4 changes: 4 additions & 0 deletions src/client/terminals/types.ts
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ import { IDisposable } from '../common/types';

export const ICodeExecutionService = Symbol('ICodeExecutionService');

export interface IAppShell {
showErrorMessage(message: string, ...items: string[]): Promise<string | undefined>;
}

export interface ICodeExecutionService {
execute(code: string, resource?: Uri): Promise<void>;
executeFile(file: Uri): Promise<void>;