Skip to content

Commit f5fa0e9

Browse files
jsjoeiojsjoeio
committed
fixup: formatting
1 parent 057d6e0 commit f5fa0e9

File tree

6 files changed

+121
-104
lines changed

6 files changed

+121
-104
lines changed

‎lib/vscode

Submodule vscode updated 1889 files

‎test/integration/fixtures/wesbos.theme-cobalt2-2.1.6/README.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
![Preview](https://raw.githubusercontent.com/wesbos/cobalt2-vscode/cobalt2-updates/images/ss.png)
66

7-
87
# Installation
98

109
1. Open **Extensions** sidebar panel in VS Code. `View → Extensions`
@@ -42,6 +41,7 @@
4241
```
4342

4443
## Important: CSS Hacks For Extra Sweet Editor
44+
4545
Some things in VS Code can't be controlled by settings, but you can install [this plugin](https://github.com/be5invis/vscode-custom-css), then make a file on your computer that will hold your custom CSS, I like to make one in my root called `~/.vscodestyles.css` and then put this everything in [cobalt2-custom-hacks.css](https://github.com/wesbos/cobalt2-vscode/blob/master/./cobalt2-custom-hacks.css) into your file.
4646

4747
Once done, open your command palette and select enable **custom CSS and JS**
@@ -53,6 +53,7 @@ Finally reload your editor and the Custom CSS should be taking. You can test thi
5353
**_Note: Reloading custom CSS and JS after every VSCode update is a must!_**
5454

5555
## Contributing
56+
5657
This is a bit weird, but to get some sort of live feedback for when editing a theme. Please let me know if you have a saner way of doing it
5758

5859
1. Open this repo in your terminal and type `npm install`
@@ -79,12 +80,12 @@ https://code.visualstudio.com/docs/getstarted/theme-color-reference
7980

8081
## Put Cobalt2 in other places!
8182

82-
* [Sublime Text](https://github.com/wesbos/cobalt2)
83-
* [Atom](https://github.com/wesbos/Cobalt2-atom)
84-
* [iTerm2](https://github.com/wesbos/Cobalt2-iterm)
85-
* [Hyper Term](https://github.com/wesbos/hyperterm-cobalt2-theme)
86-
* [Alfred](https://github.com/wesbos/Cobalt2-Alfred-Theme)
87-
* [Slack](https://github.com/wesbos/Cobalt2-Slack)
83+
- [Sublime Text](https://github.com/wesbos/cobalt2)
84+
- [Atom](https://github.com/wesbos/Cobalt2-atom)
85+
- [iTerm2](https://github.com/wesbos/Cobalt2-iterm)
86+
- [Hyper Term](https://github.com/wesbos/hyperterm-cobalt2-theme)
87+
- [Alfred](https://github.com/wesbos/Cobalt2-Alfred-Theme)
88+
- [Slack](https://github.com/wesbos/Cobalt2-Slack)
8889

8990
## Thanks
9091

‎test/integration/fixtures/wesbos.theme-cobalt2-2.1.6/cobalt2-custom-hacks.css

+40-6
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,44 @@
33
}
44

55
/* This makes the dirty tab circle & cross yellow */
6-
.monaco-workbench .part.editor > .content .editor-group-container.active > .title .tabs-container > .tab.dirty > .tab-close .action-label:not(:hover):before,
7-
.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty > .tab-close .action-label:not(:hover):before,
8-
.monaco-workbench .part.editor > .content .editor-group-container.active > .title .tabs-container > .tab.dirty > .tab-close .action-label:hover:before,
9-
.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty > .tab-close .action-label:hover:before { color: #ffc600; }
6+
.monaco-workbench
7+
.part.editor
8+
> .content
9+
.editor-group-container.active
10+
> .title
11+
.tabs-container
12+
> .tab.dirty
13+
> .tab-close
14+
.action-label:not(:hover):before,
15+
.monaco-workbench
16+
.part.editor
17+
> .content
18+
.editor-group-container
19+
> .title
20+
.tabs-container
21+
> .tab.dirty
22+
> .tab-close
23+
.action-label:not(:hover):before,
24+
.monaco-workbench
25+
.part.editor
26+
> .content
27+
.editor-group-container.active
28+
> .title
29+
.tabs-container
30+
> .tab.dirty
31+
> .tab-close
32+
.action-label:hover:before,
33+
.monaco-workbench
34+
.part.editor
35+
> .content
36+
.editor-group-container
37+
> .title
38+
.tabs-container
39+
> .tab.dirty
40+
> .tab-close
41+
.action-label:hover:before {
42+
color: #ffc600;
43+
}
1044

1145
.monaco-workbench > .part.editor > .content .editor-group-container {
1246
border-top: 1px solid #15232d !important;
@@ -29,14 +63,14 @@
2963
/* This puts an inset shadow onto the minimap scrollbar and permanently shows it */
3064
.monaco-editor .minimap .minimap-shadow-visible,
3165
.monaco-editor .minimap .minimap-shadow-hidden {
32-
box-shadow: rgba(0, 0, 0, .4) -6px 0 6px -6px inset !important;
66+
box-shadow: rgba(0, 0, 0, 0.4) -6px 0 6px -6px inset !important;
3367
/* taken from vanilla VS Code theme */
3468
position: absolute;
3569
left: -6px;
3670
width: 6px;
3771
}
3872

3973
/* This accounts for larger font cutting off - bump up 3px */
40-
.monaco-workbench>.activitybar>.content .monaco-action-bar .badge .badge-content {
74+
.monaco-workbench > .activitybar > .content .monaco-action-bar .badge .badge-content {
4175
top: 17px !important;
4276
}

‎test/integration/fixtures/wesbos.theme-cobalt2-2.1.6/package.json

+49-49
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
{
2-
"name": "theme-cobalt2",
3-
"version": "2.1.6",
4-
"displayName": "Cobalt2 Theme Official",
5-
"description": "🔥 Official theme by Wes Bos.",
6-
"publisher": "wesbos",
7-
"icon": "images/logo.png",
8-
"repository": {
9-
"type": "git",
10-
"url": "https://github.com/wesbos/cobalt2-vscode"
11-
},
12-
"galleryBanner": {
13-
"color": "#193549",
14-
"theme": "dark"
15-
},
16-
"categories": [
17-
"Themes"
18-
],
19-
"keywords": [
20-
"VSCode",
21-
"Themes"
22-
],
23-
"engines": {
24-
"vscode": "^1.15.0"
25-
},
26-
"scripts": {
27-
"start": "nodemon --exec vsce package"
28-
},
29-
"contributes": {
30-
"themes": [
31-
{
32-
"label": "Cobalt2",
33-
"uiTheme": "vs-dark",
34-
"path": "./theme/cobalt2.json"
35-
}
36-
]
37-
},
38-
"devDependencies": {
39-
"nodemon": "^1.14.12",
40-
"vsce": "^1.36.2"
41-
},
42-
"__metadata": {
43-
"id": "fb374ce1-5343-46c8-a425-900fdad15523",
44-
"publisherDisplayName": null,
45-
"publisherId": "ef56c328-1595-4d1e-9e0b-43d926331358",
46-
"isPreReleaseVersion": false,
47-
"preRelease": false,
48-
"installedTimestamp": 1655919021078
49-
}
50-
}
2+
"name": "theme-cobalt2",
3+
"version": "2.1.6",
4+
"displayName": "Cobalt2 Theme Official",
5+
"description": "🔥 Official theme by Wes Bos.",
6+
"publisher": "wesbos",
7+
"icon": "images/logo.png",
8+
"repository": {
9+
"type": "git",
10+
"url": "https://github.com/wesbos/cobalt2-vscode"
11+
},
12+
"galleryBanner": {
13+
"color": "#193549",
14+
"theme": "dark"
15+
},
16+
"categories": [
17+
"Themes"
18+
],
19+
"keywords": [
20+
"VSCode",
21+
"Themes"
22+
],
23+
"engines": {
24+
"vscode": "^1.15.0"
25+
},
26+
"scripts": {
27+
"start": "nodemon --exec vsce package"
28+
},
29+
"contributes": {
30+
"themes": [
31+
{
32+
"label": "Cobalt2",
33+
"uiTheme": "vs-dark",
34+
"path": "./theme/cobalt2.json"
35+
}
36+
]
37+
},
38+
"devDependencies": {
39+
"nodemon": "^1.14.12",
40+
"vsce": "^1.36.2"
41+
},
42+
"__metadata": {
43+
"id": "fb374ce1-5343-46c8-a425-900fdad15523",
44+
"publisherDisplayName": null,
45+
"publisherId": "ef56c328-1595-4d1e-9e0b-43d926331358",
46+
"isPreReleaseVersion": false,
47+
"preRelease": false,
48+
"installedTimestamp": 1655919021078
49+
}
50+
}

‎test/integration/fixtures/wesbos.theme-cobalt2-2.1.6/theme/cobalt2.json

+10-26
Original file line numberDiff line numberDiff line change
@@ -333,15 +333,11 @@
333333
}
334334
},
335335
{
336-
"name": "Meta JSX",
337-
"scope": [
338-
"meta.jsx.children",
339-
"meta.jsx.children.js",
340-
"meta.jsx.children.tsx"
341-
],
342-
"settings": {
343-
"foreground": "#fff"
344-
}
336+
"name": "Meta JSX",
337+
"scope": ["meta.jsx.children", "meta.jsx.children.js", "meta.jsx.children.tsx"],
338+
"settings": {
339+
"foreground": "#fff"
340+
}
345341
},
346342
{
347343
"name": "Meta Brace",
@@ -516,10 +512,8 @@
516512
}
517513
},
518514
{
519-
"name":
520-
"[HTML] - Quotes. these are a slightly different colour because expand selection will then not include quotes",
521-
"scope":
522-
"punctuation.definition.string.begin, punctuation.definition.string.end",
515+
"name": "[HTML] - Quotes. these are a slightly different colour because expand selection will then not include quotes",
516+
"scope": "punctuation.definition.string.begin, punctuation.definition.string.end",
523517
"settings": {
524518
"foreground": "#92fc79"
525519
}
@@ -589,10 +583,7 @@
589583
},
590584
{
591585
"name": "[JSON] - String",
592-
"scope": [
593-
"source.json string",
594-
"source.json punctuation.definition.string"
595-
],
586+
"scope": ["source.json string", "source.json punctuation.definition.string"],
596587
"settings": {
597588
"foreground": "#e1efff"
598589
}
@@ -606,11 +597,7 @@
606597
},
607598
{
608599
"name": "[MARKDOWN] - Heading Name Section",
609-
"scope": [
610-
"entity.name.section.markdown",
611-
"markup.heading.setext.1.markdown",
612-
"markup.heading.setext.2.markdown"
613-
],
600+
"scope": ["entity.name.section.markdown", "markup.heading.setext.1.markdown", "markup.heading.setext.2.markdown"],
614601
"settings": {
615602
"foreground": "#ffc600",
616603
"fontStyle": "bold"
@@ -688,10 +675,7 @@
688675
},
689676
{
690677
"name": "[MARKDOWN] - Link Address",
691-
"scope": [
692-
"markup.underline.link.markdown",
693-
"markup.underline.link.image.markdown"
694-
],
678+
"scope": ["markup.underline.link.markdown", "markup.underline.link.image.markdown"],
695679
"settings": {
696680
"foreground": "#9effff"
697681
}

‎test/integration/listExtensions.test.ts

+13-15
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,18 @@ import { runCodeServerCommand } from "../utils/runCodeServerCommand"
66

77
// Source: https://stackoverflow.com/a/71587262/3015595
88
async function copyDir(source: string, destination: string): Promise<any> {
9-
const directoryEntries = await readdir(source, { withFileTypes: true });
10-
await mkdir(destination, { recursive: true });
11-
12-
return Promise.all(
13-
directoryEntries.map(async (entry) => {
14-
const sourcePath = path.join(source, entry.name);
15-
const destinationPath = path.join(destination, entry.name);
16-
17-
return entry.isDirectory()
18-
? copyDir(sourcePath, destinationPath)
19-
: copyFile(sourcePath, destinationPath);
20-
})
21-
);
22-
}
9+
const directoryEntries = await readdir(source, { withFileTypes: true })
10+
await mkdir(destination, { recursive: true })
11+
12+
return Promise.all(
13+
directoryEntries.map(async (entry) => {
14+
const sourcePath = path.join(source, entry.name)
15+
const destinationPath = path.join(destination, entry.name)
16+
17+
return entry.isDirectory() ? copyDir(sourcePath, destinationPath) : copyFile(sourcePath, destinationPath)
18+
}),
19+
)
20+
}
2321

2422
describe("--list-extensions", () => {
2523
const testName = "listExtensions"
@@ -36,7 +34,7 @@ describe("--list-extensions", () => {
3634
await copyDir(unpackedExtFixture, `${tempDir}/${extName}-${extVersion}`)
3735
})
3836
it("should list installed extensions", async () => {
39-
const { stdout } = await runCodeServerCommand([...setupFlags, "--list-extensions" ], {stdout: "log"})
37+
const { stdout } = await runCodeServerCommand([...setupFlags, "--list-extensions"], { stdout: "log" })
4038
expect(stdout).toMatch(extName)
4139
}, 20000)
4240
})

0 commit comments

Comments
 (0)