Skip to content

Commit c8d61e8

Browse files
mmshiveshmmshivesh
committed
Merge remote-tracking branch 'origin/main'
2 parents 4405a60 + 336cf02 commit c8d61e8

File tree

119 files changed

+3070
-648
lines changed

Some content is hidden

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

119 files changed

+3070
-648
lines changed

‎.all-contributorsrc

+19
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,25 @@
196196
"contributions": [
197197
"code"
198198
]
199+
},
200+
{
201+
"login": "jav-solo",
202+
"name": "Javier Solorzano",
203+
"avatar_url": "https://avatars.githubusercontent.com/u/10246220?v=4",
204+
"profile": "https://github.com/jav-solo",
205+
"contributions": [
206+
"code",
207+
"bug"
208+
]
209+
},
210+
{
211+
"login": "AngCosmin",
212+
"name": "Cosmin Anghel",
213+
"avatar_url": "https://avatars.githubusercontent.com/u/8146514?v=4",
214+
"profile": "http://angcosmin.com",
215+
"contributions": [
216+
"code"
217+
]
199218
}
200219
],
201220
"contributorsPerLine": 7,

‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ jobs:
2020
workflows:
2121
primary:
2222
jobs:
23-
- test
23+
# - test
2424
- lint

‎CodeEdit.xcodeproj/project.pbxproj

+60-11
Large diffs are not rendered by default.

‎CodeEdit.xcodeproj/xcshareddata/xcschemes/CodeEdit.xcscheme

+30
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,36 @@
4848
ReferencedContainer = "container:CodeEditModules">
4949
</BuildableReference>
5050
</TestableReference>
51+
<TestableReference
52+
skipped = "NO">
53+
<BuildableReference
54+
BuildableIdentifier = "primary"
55+
BlueprintIdentifier = "CodeEditUITests"
56+
BuildableName = "CodeEditUITests"
57+
BlueprintName = "CodeEditUITests"
58+
ReferencedContainer = "container:CodeEditModules">
59+
</BuildableReference>
60+
</TestableReference>
61+
<TestableReference
62+
skipped = "NO">
63+
<BuildableReference
64+
BuildableIdentifier = "primary"
65+
BlueprintIdentifier = "WelcomeModuleTests"
66+
BuildableName = "WelcomeModuleTests"
67+
BlueprintName = "WelcomeModuleTests"
68+
ReferencedContainer = "container:CodeEditModules">
69+
</BuildableReference>
70+
</TestableReference>
71+
<TestableReference
72+
skipped = "NO">
73+
<BuildableReference
74+
BuildableIdentifier = "primary"
75+
BlueprintIdentifier = "GitClientTests"
76+
BuildableName = "GitClientTests"
77+
BlueprintName = "GitClientTests"
78+
ReferencedContainer = "container:CodeEditModules">
79+
</BuildableReference>
80+
</TestableReference>
5181
</Testables>
5282
</TestAction>
5383
<LaunchAction

‎CodeEdit.xcworkspace/xcshareddata/swiftpm/Package.resolved

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"repositoryURL": "https://github.com/CodeEditApp/CodeEditSymbols",
1616
"state": {
1717
"branch": "main",
18-
"revision": "51ab9b4e7e6434ce8e2c74b04a6ba2591b972bb1",
18+
"revision": "9a94c84aeae793e4767ea7fbb515d564a4b7a49c",
1919
"version": null
2020
}
2121
},
@@ -30,11 +30,11 @@
3030
},
3131
{
3232
"package": "Highlightr",
33-
"repositoryURL": "https://github.com/raspu/Highlightr.git",
33+
"repositoryURL": "https://github.com/lukepistrol/Highlightr.git",
3434
"state": {
35-
"branch": null,
36-
"revision": "93199b9e434f04bda956a613af8f571933f9f037",
37-
"version": "2.1.2"
35+
"branch": "main",
36+
"revision": "7d278c8e92d96cbfec8dbb3c8054990b2951db98",
37+
"version": null
3838
}
3939
},
4040
{

‎CodeEdit/Assets.xcassets/Custom Colors/HistoryInspectorHash.colorset/Contents.json renamed to ‎CodeEdit/Assets.xcassets/Custom Colors/InspectorBackgroundColor.colorset/Contents.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"color-space" : "srgb",
66
"components" : {
77
"alpha" : "1.000",
8-
"blue" : "0xE1",
9-
"green" : "0xE1",
10-
"red" : "0xE1"
8+
"blue" : "0xF7",
9+
"green" : "0xF5",
10+
"red" : "0xF4"
1111
}
1212
},
1313
"idiom" : "universal"
@@ -23,9 +23,9 @@
2323
"color-space" : "srgb",
2424
"components" : {
2525
"alpha" : "1.000",
26-
"blue" : "0x59",
27-
"green" : "0x59",
28-
"red" : "0x59"
26+
"blue" : "0x25",
27+
"green" : "0x1F",
28+
"red" : "0x1C"
2929
}
3030
},
3131
"idiom" : "universal"

‎CodeEdit/DefaultThemes/codeedit-github-dark.json

+126
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
{
2+
"author" : "CodeEdit",
3+
"displayName" : "GitHub Dark",
4+
"editor" : {
5+
"invisibles" : {
6+
"color" : "#424D5B"
7+
},
8+
"comments" : {
9+
"color" : "#8B949E"
10+
},
11+
"numbers" : {
12+
"color" : "#79C0FF"
13+
},
14+
"commands" : {
15+
"color" : "#D2A8FF"
16+
},
17+
"lineHighlight" : {
18+
"color" : "#23252B"
19+
},
20+
"values" : {
21+
"color" : "#79C0FF"
22+
},
23+
"background" : {
24+
"color" : "#0D1117"
25+
},
26+
"keywords" : {
27+
"color" : "#FF7B72"
28+
},
29+
"text" : {
30+
"color" : "#C9D1D9"
31+
},
32+
"insertionPoint" : {
33+
"color" : "#C9D1D9"
34+
},
35+
"strings" : {
36+
"color" : "#A5D6FF"
37+
},
38+
"selection" : {
39+
"color" : "#1E4273"
40+
},
41+
"types" : {
42+
"color" : "#79C0FF"
43+
},
44+
"variables" : {
45+
"color" : "#D2A8FF"
46+
},
47+
"attributes" : {
48+
"color" : "#79C0FF"
49+
},
50+
"characters" : {
51+
"color" : "#79C0FF"
52+
}
53+
},
54+
"distributionURL" : "https:\/\/github.com\/CodeEditApp\/CodeEdit",
55+
"terminal" : {
56+
"white" : {
57+
"color" : "#d9d9d9"
58+
},
59+
"brightMagenta" : {
60+
"color" : "#af52de"
61+
},
62+
"brightRed" : {
63+
"color" : "#ff3b30"
64+
},
65+
"blue" : {
66+
"color" : "#007aff"
67+
},
68+
"red" : {
69+
"color" : "#ff3b30"
70+
},
71+
"green" : {
72+
"color" : "#28cd41"
73+
},
74+
"boldText" : {
75+
"color" : "#C9D1D9"
76+
},
77+
"brightGreen" : {
78+
"color" : "#28cd41"
79+
},
80+
"background" : {
81+
"color" : "#0D1117"
82+
},
83+
"cursor" : {
84+
"color" : "#C9D1D9"
85+
},
86+
"selection" : {
87+
"color" : "#1E4273"
88+
},
89+
"magenta" : {
90+
"color" : "#af52de"
91+
},
92+
"black" : {
93+
"color" : "#1f2024"
94+
},
95+
"text" : {
96+
"color" : "#C9D1D9"
97+
},
98+
"brightWhite" : {
99+
"color" : "#ffffff"
100+
},
101+
"brightBlue" : {
102+
"color" : "#007aff"
103+
},
104+
"brightYellow" : {
105+
"color" : "#ffff00"
106+
},
107+
"cyan" : {
108+
"color" : "#59adc4"
109+
},
110+
"yellow" : {
111+
"color" : "#ffcc00"
112+
},
113+
"brightCyan" : {
114+
"color" : "#55bef0"
115+
},
116+
"brightBlack" : {
117+
"color" : "#8e8e93"
118+
}
119+
},
120+
"version" : "0.0.1",
121+
"license" : "MIT",
122+
"type" : "dark",
123+
"name" : "codeedit-github-dark",
124+
"description" : "GitHub dark theme."
125+
}
126+

0 commit comments

Comments
 (0)