Skip to content

Commit c950188

Browse files
committed
Merge branch 'master' into mini-dashboard-actions
# Conflicts: # package.json
2 parents ad8ce9b + 702b9a9 commit c950188

22 files changed

Lines changed: 219 additions & 147 deletions

images/dark-icon-critical.svg

Lines changed: 6 additions & 0 deletions
Loading

images/dark-icon-info.svg

Lines changed: 6 additions & 0 deletions
Loading

images/dark-icon-warning.svg

Lines changed: 6 additions & 0 deletions
Loading

images/deepcode-logo.svg

Lines changed: 7 additions & 0 deletions
Loading

images/light-icon-critical.svg

Lines changed: 6 additions & 0 deletions
Loading

images/light-icon-info.svg

Lines changed: 6 additions & 0 deletions
Loading

images/light-icon-warning.svg

Lines changed: 6 additions & 0 deletions
Loading

package.json

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
{
8787
"id": "deepcode",
8888
"title": "DeepCode",
89-
"icon": "images/icon-sidebar.svg"
89+
"icon": "images/deepcode-logo.svg"
9090
}
9191
]
9292
},
@@ -112,15 +112,10 @@
112112
"name": "DeepCode Extension",
113113
"when": "!deepcode:error && deepcode:loggedIn && deepcode:uploadApproved && !deepcode:workspaceFound"
114114
},
115-
{
116-
"id": "deepcode.views.progress",
117-
"name": "DeepCode Analysis",
118-
"when": "!deepcode:error && deepcode:loggedIn && deepcode:uploadApproved && deepcode:workspaceFound && !deepcode:analysisCompleted"
119-
},
120115
{
121116
"id": "deepcode.views.analysis",
122117
"name": "DeepCode Analysis",
123-
"when": "!deepcode:error && deepcode:loggedIn && deepcode:uploadApproved && deepcode:workspaceFound && deepcode:analysisCompleted"
118+
"when": "!deepcode:error && deepcode:loggedIn && deepcode:uploadApproved && deepcode:workspaceFound"
124119
},
125120
{
126121
"id": "deepcode.views.actions",
@@ -146,20 +141,16 @@
146141
},
147142
{
148143
"view": "deepcode.views.welcome",
149-
"contents": "Welcome to DeepCode for Visual Studio Code. 👋\nLet's start by connecting VS Code with DeepCode:\n[Connect VS Code with DeepCode](command:deepcode.login 'Connect with DeepCode')\n🚀 DeepCode's mission is to find bugs in your Javascript, TypeScript, Python, Java and C/C++ code, fast!\n💬 A VS Code user (Lucas) recently said:\"I'm really crazy about this super simple service that feels like it's from 5 years in the future\".\n👉 Connect with DeepCode and start your first analysis!"
144+
"contents": "Welcome to DeepCode for Visual Studio Code. 👋\nLet's start by connecting VS Code with DeepCode:\n[Connect VS Code with DeepCode](command:deepcode.login 'Connect with DeepCode')\n👉 DeepCode's mission is to finds bugs, fast. Connect with DeepCode to start your first analysis!"
150145
},
151146
{
152147
"view": "deepcode.views.tc",
153-
"contents": "Thanks for connecting with DeepCode. ✅\n 👉 You are almost set 🤗. DeepCode's proprietary AI model is analysing the code remotely on DeepCode's servers. Let's confirm you know this and start the remote analysis of this workspace - feel free to check out our [terms](https://www.deepcode.ai/tc?utm_source=vsc).\n[Accept and start analysing](command:deepcode.approve 'Upload code to DeepCode')\nYou can always change this later in the [configuration panel](command:deepcode.settings)."
148+
"contents": "Thanks for connecting with DeepCode. ✅\n 👉 You are almost set 🤗. DeepCode is analysing the code remotely on DeepCode's servers(our [terms](https://www.deepcode.ai/tc?utm_source=vsc). Let's confirm you know this and start the analysis.\n[Accept and start analysing](command:deepcode.approve 'Upload code to DeepCode')\nYou can always change it in the [configuration panel](command:deepcode.settings)."
154149
},
155150
{
156151
"view": "deepcode.views.empty",
157152
"contents": "Open a workspace or a folder in Visual Studio Code to start the analysis."
158153
},
159-
{
160-
"view": "deepcode.views.progress",
161-
"contents": "Analysis in progress"
162-
},
163154
{
164155
"view": "deepcode.views.analysis",
165156
"contents": "DeepCode analyzed your code and found no issue! 🎉"
@@ -183,13 +174,13 @@
183174
"menus": {
184175
"view/title": [
185176
{
186-
"command": "deepcode.settings",
187-
"when": "view == deepcode.views.support",
177+
"command": "deepcode.start",
178+
"when": "view == deepcode.views.analysis",
188179
"group": "navigation"
189180
},
190181
{
191-
"command": "deepcode.start",
192-
"when": "view == deepcode.views.analysis",
182+
"command": "deepcode.settings",
183+
"when": "view != deepcode.views.support",
193184
"group": "navigation"
194185
}
195186
],
@@ -203,13 +194,13 @@
203194
"commands": [
204195
{
205196
"command": "deepcode.start",
206-
"title": "DeepCode scan",
207-
"icon": "images/icon-sidebar.svg"
197+
"title": "DeepCode re-scan",
198+
"icon": "$(refresh)"
208199
},
209200
{
210201
"command": "deepcode.settings",
211202
"title": "DeepCode settings",
212-
"icon": "images/icon-sidebar.svg"
203+
"icon": "$(gear)"
213204
},
214205
{
215206
"command": "deepcode.login",

src/deepcode/DeepCodeExtension.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ import { openDeepcodeSettingsCommand } from "./utils/vscodeCommandsUtils";
1616

1717
import {
1818
DEEPCODE_VIEW_SUPPORT,
19-
DEEPCODE_VIEW_PROGRESS,
2019
DEEPCODE_VIEW_ANALYSIS,
2120
} from "./constants/views";
2221
import { SupportProvider } from "./view/SupportProvider";
23-
import { ProgressProvider } from "./view/ProgressProvider";
2422
import { IssueProvider } from "./view/IssueProvider";
2523

2624
class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterface {
@@ -80,11 +78,6 @@ class DeepCodeExtension extends DeepCodeLib implements DeepCode.ExtensionInterfa
8078
new SupportProvider(this)
8179
);
8280

83-
vscode.window.registerTreeDataProvider(
84-
DEEPCODE_VIEW_PROGRESS,
85-
new ProgressProvider(this)
86-
);
87-
8881
vscode.window.registerTreeDataProvider(
8982
DEEPCODE_VIEW_ANALYSIS,
9083
new IssueProvider(this)

src/deepcode/constants/general.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ export const DEEPCODE_EXTENSION_NAME = "deepcode";
44
export const ALLOWED_PAYLOAD_SIZE = 1024 * 1024 * 4; // max payload size of 4MB in bytes
55
export const MAX_CONNECTION_RETRIES = 5; // max number of automatic retries before showing an error
66
export const IDE_NAME = "vscode";
7+
export const EXECUTION_DEBOUNCE_INTERVAL = 1000;
8+
export const REFRESH_VIEW_DEBOUNCE_INTERVAL = 200;

0 commit comments

Comments
 (0)