Skip to content

Commit d22abf4

Browse files
author
ty-d
committed
Merge branch 'master' of https://github.com/intersystems-community/vscode-objectscript into DocumentLinksInOutput
2 parents cd790e4 + 0bb36b3 commit d22abf4

File tree

7 files changed

+107
-5983
lines changed

7 files changed

+107
-5983
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ dist/
77
*.vsix
88
vscode*.d.ts
99
test-fixtures
10+
.DS_Store

docs/Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ source "https://rubygems.org"
1414
# uncomment the line below. To upgrade, run `bundle update github-pages`.
1515
gem "github-pages", group: :jekyll_plugins
1616
# If you have any plugins, put them here!
17-
gem "kramdown", ">= 2.3.0"
17+
gem "kramdown", ">= 2.3.1"
1818
# group :jekyll_plugins do
1919
# gem "jekyll-feed", "~> 0.12"
2020
# end
@@ -29,3 +29,4 @@ end
2929
# Performance-booster for watching directories on Windows
3030
gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
3131

32+
gem "webrick"

docs/Gemfile.lock

Lines changed: 53 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.0.3.2)
4+
activesupport (6.0.3.6)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 0.7, < 2)
77
minitest (~> 5.1)
@@ -16,48 +16,51 @@ GEM
1616
colorator (1.1.0)
1717
commonmarker (0.17.13)
1818
ruby-enum (~> 0.5)
19-
concurrent-ruby (1.1.7)
20-
dnsruby (1.61.4)
19+
concurrent-ruby (1.1.8)
20+
dnsruby (1.61.5)
2121
simpleidn (~> 0.1)
22-
em-websocket (0.5.1)
22+
em-websocket (0.5.2)
2323
eventmachine (>= 0.12.9)
2424
http_parser.rb (~> 0.6.0)
2525
ethon (0.12.0)
2626
ffi (>= 1.3.0)
2727
eventmachine (1.2.7)
2828
eventmachine (1.2.7-x64-mingw32)
2929
execjs (2.7.0)
30-
faraday (1.0.1)
30+
faraday (1.3.0)
31+
faraday-net_http (~> 1.0)
3132
multipart-post (>= 1.2, < 3)
32-
ffi (1.13.1)
33-
ffi (1.13.1-x64-mingw32)
33+
ruby2_keywords
34+
faraday-net_http (1.0.1)
35+
ffi (1.15.0)
36+
ffi (1.15.0-x64-mingw32)
3437
forwardable-extended (2.6.0)
3538
gemoji (3.0.1)
36-
github-pages (207)
37-
github-pages-health-check (= 1.16.1)
39+
github-pages (214)
40+
github-pages-health-check (= 1.17.0)
3841
jekyll (= 3.9.0)
3942
jekyll-avatar (= 0.7.0)
4043
jekyll-coffeescript (= 1.1.1)
4144
jekyll-commonmark-ghpages (= 0.1.6)
4245
jekyll-default-layout (= 0.1.4)
43-
jekyll-feed (= 0.13.0)
46+
jekyll-feed (= 0.15.1)
4447
jekyll-gist (= 1.5.0)
4548
jekyll-github-metadata (= 2.13.0)
46-
jekyll-mentions (= 1.5.1)
49+
jekyll-mentions (= 1.6.0)
4750
jekyll-optional-front-matter (= 0.3.2)
4851
jekyll-paginate (= 1.1.0)
4952
jekyll-readme-index (= 0.3.0)
50-
jekyll-redirect-from (= 0.15.0)
53+
jekyll-redirect-from (= 0.16.0)
5154
jekyll-relative-links (= 0.6.1)
52-
jekyll-remote-theme (= 0.4.1)
55+
jekyll-remote-theme (= 0.4.3)
5356
jekyll-sass-converter (= 1.5.2)
54-
jekyll-seo-tag (= 2.6.1)
57+
jekyll-seo-tag (= 2.7.1)
5558
jekyll-sitemap (= 1.4.0)
5659
jekyll-swiss (= 1.0.0)
5760
jekyll-theme-architect (= 0.1.1)
5861
jekyll-theme-cayman (= 0.1.1)
5962
jekyll-theme-dinky (= 0.1.1)
60-
jekyll-theme-hacker (= 0.1.1)
63+
jekyll-theme-hacker (= 0.1.2)
6164
jekyll-theme-leap-day (= 0.1.1)
6265
jekyll-theme-merlot (= 0.1.1)
6366
jekyll-theme-midnight (= 0.1.1)
@@ -68,20 +71,20 @@ GEM
6871
jekyll-theme-tactile (= 0.1.1)
6972
jekyll-theme-time-machine (= 0.1.1)
7073
jekyll-titles-from-headings (= 0.5.3)
71-
jemoji (= 0.11.1)
72-
kramdown (= 2.3.0)
74+
jemoji (= 0.12.0)
75+
kramdown (= 2.3.1)
7376
kramdown-parser-gfm (= 1.1.0)
7477
liquid (= 4.0.3)
7578
mercenary (~> 0.3)
7679
minima (= 2.5.1)
7780
nokogiri (>= 1.10.4, < 2.0)
78-
rouge (= 3.19.0)
81+
rouge (= 3.26.0)
7982
terminal-table (~> 1.4)
80-
github-pages-health-check (1.16.1)
83+
github-pages-health-check (1.17.0)
8184
addressable (~> 2.3)
8285
dnsruby (~> 1.60)
8386
octokit (~> 4.0)
84-
public_suffix (~> 3.0)
87+
public_suffix (>= 2.0.2, < 5.0)
8588
typhoeus (~> 1.3)
8689
html-pipeline (2.14.0)
8790
activesupport (>= 2)
@@ -116,33 +119,34 @@ GEM
116119
rouge (>= 2.0, < 4.0)
117120
jekyll-default-layout (0.1.4)
118121
jekyll (~> 3.0)
119-
jekyll-feed (0.13.0)
122+
jekyll-feed (0.15.1)
120123
jekyll (>= 3.7, < 5.0)
121124
jekyll-gist (1.5.0)
122125
octokit (~> 4.2)
123126
jekyll-github-metadata (2.13.0)
124127
jekyll (>= 3.4, < 5.0)
125128
octokit (~> 4.0, != 4.4.0)
126-
jekyll-mentions (1.5.1)
129+
jekyll-mentions (1.6.0)
127130
html-pipeline (~> 2.3)
128131
jekyll (>= 3.7, < 5.0)
129132
jekyll-optional-front-matter (0.3.2)
130133
jekyll (>= 3.0, < 5.0)
131134
jekyll-paginate (1.1.0)
132135
jekyll-readme-index (0.3.0)
133136
jekyll (>= 3.0, < 5.0)
134-
jekyll-redirect-from (0.15.0)
137+
jekyll-redirect-from (0.16.0)
135138
jekyll (>= 3.3, < 5.0)
136139
jekyll-relative-links (0.6.1)
137140
jekyll (>= 3.3, < 5.0)
138-
jekyll-remote-theme (0.4.1)
141+
jekyll-remote-theme (0.4.3)
139142
addressable (~> 2.0)
140143
jekyll (>= 3.5, < 5.0)
141-
rubyzip (>= 1.3.0)
144+
jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
145+
rubyzip (>= 1.3.0, < 3.0)
142146
jekyll-sass-converter (1.5.2)
143147
sass (~> 3.4)
144-
jekyll-seo-tag (2.6.1)
145-
jekyll (>= 3.3, < 5.0)
148+
jekyll-seo-tag (2.7.1)
149+
jekyll (>= 3.8, < 5.0)
146150
jekyll-sitemap (1.4.0)
147151
jekyll (>= 3.7, < 5.0)
148152
jekyll-swiss (1.0.0)
@@ -155,8 +159,8 @@ GEM
155159
jekyll-theme-dinky (0.1.1)
156160
jekyll (~> 3.5)
157161
jekyll-seo-tag (~> 2.0)
158-
jekyll-theme-hacker (0.1.1)
159-
jekyll (~> 3.5)
162+
jekyll-theme-hacker (0.1.2)
163+
jekyll (> 3.5, < 5.0)
160164
jekyll-seo-tag (~> 2.0)
161165
jekyll-theme-leap-day (0.1.1)
162166
jekyll (~> 3.5)
@@ -190,16 +194,16 @@ GEM
190194
jekyll (>= 3.3, < 5.0)
191195
jekyll-watch (2.2.1)
192196
listen (~> 3.0)
193-
jemoji (0.11.1)
197+
jemoji (0.12.0)
194198
gemoji (~> 3.0)
195199
html-pipeline (~> 2.2)
196200
jekyll (>= 3.0, < 5.0)
197-
kramdown (2.3.0)
201+
kramdown (2.3.1)
198202
rexml
199203
kramdown-parser-gfm (1.1.0)
200204
kramdown (~> 2.0)
201205
liquid (4.0.3)
202-
listen (3.2.1)
206+
listen (3.5.1)
203207
rb-fsevent (~> 0.10, >= 0.10.3)
204208
rb-inotify (~> 0.9, >= 0.9.10)
205209
mercenary (0.3.6)
@@ -208,27 +212,28 @@ GEM
208212
jekyll (>= 3.5, < 5.0)
209213
jekyll-feed (~> 0.9)
210214
jekyll-seo-tag (~> 2.1)
211-
minitest (5.14.1)
215+
minitest (5.14.4)
212216
multipart-post (2.1.1)
213-
nokogiri (1.11.0)
217+
nokogiri (1.11.3)
214218
mini_portile2 (~> 2.5.0)
215219
racc (~> 1.4)
216-
nokogiri (1.11.0-x64-mingw32)
220+
nokogiri (1.11.3-x64-mingw32)
217221
racc (~> 1.4)
218-
octokit (4.18.0)
222+
octokit (4.20.0)
219223
faraday (>= 0.9)
220224
sawyer (~> 0.8.0, >= 0.5.3)
221225
pathutil (0.16.2)
222226
forwardable-extended (~> 2.6)
223-
public_suffix (3.1.1)
227+
public_suffix (4.0.6)
224228
racc (1.5.2)
225229
rb-fsevent (0.10.4)
226230
rb-inotify (0.10.1)
227231
ffi (~> 1.0)
228-
rexml (3.2.4)
229-
rouge (3.19.0)
230-
ruby-enum (0.8.0)
232+
rexml (3.2.5)
233+
rouge (3.26.0)
234+
ruby-enum (0.9.0)
231235
i18n
236+
ruby2_keywords (0.0.4)
232237
rubyzip (2.3.0)
233238
safe_yaml (1.0.5)
234239
sass (3.7.4)
@@ -239,35 +244,36 @@ GEM
239244
sawyer (0.8.2)
240245
addressable (>= 2.3.5)
241246
faraday (> 0.8, < 2.0)
242-
simpleidn (0.1.1)
247+
simpleidn (0.2.1)
243248
unf (~> 0.1.4)
244249
terminal-table (1.8.0)
245250
unicode-display_width (~> 1.1, >= 1.1.1)
246251
thread_safe (0.3.6)
247252
typhoeus (1.4.0)
248253
ethon (>= 0.9.0)
249-
tzinfo (1.2.7)
254+
tzinfo (1.2.9)
250255
thread_safe (~> 0.1)
251-
tzinfo-data (1.2020.1)
256+
tzinfo-data (1.2021.1)
252257
tzinfo (>= 1.0.0)
253258
unf (0.1.4)
254259
unf_ext
255260
unf_ext (0.0.7.7)
256-
unf_ext (0.0.7.7-x64-mingw32)
257261
unicode-display_width (1.7.0)
258262
wdm (0.1.1)
259-
zeitwerk (2.4.0)
263+
webrick (1.7.0)
264+
zeitwerk (2.4.2)
260265

261266
PLATFORMS
262267
ruby
263268
x64-mingw32
264269

265270
DEPENDENCIES
266271
github-pages
267-
kramdown (>= 2.3.0)
272+
kramdown (>= 2.3.1)
268273
tzinfo (~> 1.2)
269274
tzinfo-data
270275
wdm (~> 0.1.1)
276+
webrick
271277

272278
BUNDLED WITH
273-
2.1.4
279+
2.2.15

0 commit comments

Comments
 (0)