Skip to content

Commit 2998996

Browse files
committed
revert: cloud9 related code
This code removes nearly all cloud9 codepaths: - Icons, readme generation, scripts - ikp3db lambda/sam debugger support - Cloud9 only codepaths and hacks - Docs and comments mentioning Cloud9 Includes some follow up items as TODOs in code. Some items were left in case they are helpful in the future (e.g. for vscode web or similar). The items should be renamed from Cloud9 if used again in the future. Some examples are Cloud9 runtime environment checks (for lambda/sam), `isCloud9()` and properties/text for Cloud9 IDE, some SAM artifacts, don't start LSP server, etc. Search cloud9 in vscode after merging this change.
1 parent c9b4746 commit 2998996

File tree

91 files changed

+267
-1789
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+267
-1789
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ packages/amazonq/package.nls.json
4747
packages/amazonq/resources
4848

4949
# Icons
50-
packages/*/resources/icons/cloud9/generated/**
5150
packages/*/resources/fonts/aws-toolkit-icons.woff
5251
packages/*/resources/css/icons.css
5352

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ If you are contribuing visual assets from other open source repos, the source re
633633
## Using new vscode APIs
634634

635635
The minimum required vscode version specified in [package.json](https://github.com/aws/aws-toolkit-vscode/blob/07119655109bb06105a3f53bbcd86b812b32cdbe/package.json#L16)
636-
is decided by the version of vscode running in Cloud9 and other vscode-compatible targets.
636+
is decided by the version of vscode running in other supported vscode-compatible targets (e.g. web).
637637

638638
But you can still use the latest vscode APIs, by checking the current running vscode version. For example, to use a vscode 1.64 API:
639639

cloud9-toolkit-install.sh

Lines changed: 0 additions & 139 deletions
This file was deleted.

docs/CODE_GUIDELINES.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,10 @@ that is a net cost.
8181
- Telemetry: "active" vs "passive"
8282
- Active (`passive:false`) metrics are those intended to appear in DAU count.
8383
- Icons:
84-
- Where possible, use IDE-specific standard icons (e.g. standard VSCode
85-
standard icons in VSCode, and Cloud9 standard icons in Cloud9). The typical
86-
(maintainable) way to do this is to use _named_ icons (what VSCode calls
84+
- Where possible, use standard VSCode icons. The typical (maintainable)
85+
way to do this is to use _named_ icons (what VSCode calls
8786
[codicons](https://microsoft.github.io/vscode-codicons/)) as opposed to
8887
icons shipped with the Toolkit build and referenced by _path_.
89-
- For cases where icons must be statically defined (package.json), if Cloud9
90-
does not support the VSCode standard icon, use the Cloud9 icon.
9188
- Changelog guidelines
9289
- Prefer active voice: "You can do X" instead of "X can be done"
9390
- Avoid unnecessary use of `lodash` (which we may remove in the future).
@@ -240,11 +237,11 @@ _See also [arch_develop.md](./arch_develop.md#exceptions)._
240237
241238
- PREFER:
242239
```ts
243-
things.filter(o => o.isFoo)
240+
things.filter((o) => o.isFoo)
244241
```
245242
- INSTEAD OF:
246243
```ts
247-
things.filter(thing => thing.isFoo)
244+
things.filter((thing) => thing.isFoo)
248245
```
249246
250247
## User settings

docs/arch_runtime.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ If you must define a new key (is it _really_ necessary?), follow these guideline
3131
These keys are currently set by the core/ package, but many of them may eventually be migrated to
3232
toolkit/ or amazonq/ if appropriate.
3333

34-
- `isCloud9`: This is hardcoded by Cloud9 itself, not the Toolkit.
35-
- Cloud9 _does not support setContext_. So this is the only usable key there.
3634
- `aws.codecatalyst.connected`: CodeCatalyst connection is active.
3735
- `aws.codewhisperer.connected`: CodeWhisperer connection is active.
3836
- `aws.codewhisperer.connectionExpired`: CodeWhisperer connection is active, but the connection is expired.

docs/icons.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ All icons that are used in the extensions can be found in `resources/icons`.
44

55
A [build script](../scripts/generateIcons.ts) generates extension artifacts in [core/](../packages/core/):
66

7-
- `resources/icons/cloud9/generated`
87
- `resources/fonts/aws-toolkit-icons.woff`
98
- `resources/css/icons.css`
109
- `contributes.icons` in [amazonq package.json](../packages/amazonq/package.json) and [toolkit package.json](../packages/toolkit/package.json)
@@ -31,7 +30,7 @@ If your desired icon does not work well as a font, see [Theme Overrides](#theme-
3130

3231
## Identifiers
3332

34-
Icons (except those in `cloud9`) can be referenced within the Toolkit by concatenating the icon path with hyphens, omitting the 'theme' if applicable.
33+
Icons can be referenced within the Toolkit by concatenating the icon path with hyphens, omitting the 'theme' if applicable.
3534

3635
Examples:
3736

@@ -50,11 +49,6 @@ For example, if I wanted to use a special App Runner service icon, then I need t
5049
- `resources/icons/aws/dark/apprunner-service.svg`
5150
- `resources/icons/aws/light/apprunner-service.svg`
5251

53-
A similar format is used for overriding icons only on Cloud9:
54-
55-
- `resources/icons/cloud9/dark/aws-apprunner-service.svg`
56-
- `resources/icons/cloud9/light/aws-apprunner-service.svg`
57-
5852
These icons will **not** be usuable as Codicons or as font icons.
5953

6054
## Third Party

packages/amazonq/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
{
199199
"id": "aws.amazonq.notifications",
200200
"name": "%AWS.notifications.title%",
201-
"when": "!isCloud9 && !aws.isSageMaker && aws.amazonq.notifications.show"
201+
"when": "!aws.isSageMaker && aws.amazonq.notifications.show"
202202
},
203203
{
204204
"type": "webview",
@@ -498,7 +498,7 @@
498498
"command": "_aws.amazonq.notifications.dismiss",
499499
"title": "%AWS.generic.dismiss%",
500500
"category": "%AWS.amazonq.title%",
501-
"enablement": "isCloud9 || !aws.isWebExtHost",
501+
"enablement": "!aws.isWebExtHost",
502502
"icon": "$(remove-close)"
503503
},
504504
{

packages/core/resources/css/base-cloud9.css

Lines changed: 0 additions & 68 deletions
This file was deleted.

packages/core/resources/icons/cloud9/dark/vscode-help.svg

Lines changed: 0 additions & 12 deletions
This file was deleted.

packages/core/resources/icons/cloud9/light/vscode-help.svg

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)