Skip to content

Commit 8a17885

Browse files
trajamsmithtrajamsmith
committed
Update atest for YAML schemas, update yaml language server version
1 parent c3b25cb commit 8a17885

File tree

4 files changed

+76
-64
lines changed

4 files changed

+76
-64
lines changed

‎atest/07_Configuration.robot

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ ${CONFIG PYLS} {"language_servers": {"pyls": {"serverSettings": {"pyls": {"pl
1010
${PYFLAKES DIAGNOSTIC} ${CSS DIAGNOSTIC}-Error[title="undefined name 'foo' (pyflakes)"]
1111
${FLAKE8 DIAGNOSTIC} ${CSS DIAGNOSTIC}-Warning[title="undefined name 'foo' (flake8)"]
1212

13-
# ${CONFIG YAML SCHEMA} {"language_servers": {"yaml-language-server": {"serverSettings": {"yaml.schemas": {"http://json.schemastore.org/composer": "*"}}}}}
14-
# ${YAML DIAGNOSTIC} ${CSS DIAGNOSTIC}-Error[title="duplicate key"]
15-
# # TODO: fix this for the actual schema error to expect
16-
# ${SCHEMA DIAGNOSTIC} ${CSS DIAGNOSTIC}-Error[title="TODO: schema error here"]
13+
${CONFIG YAML SCHEMA} {"language_servers": {"yaml-language-server": {"serverSettings": {"yaml.schemas": {"http://json.schemastore.org/composer": "*"}}}}}
14+
${YAML DIAGNOSTIC} ${CSS DIAGNOSTIC}-Error[title="duplicate key"]
15+
# Composer YAML files don't allow a "greetings" key
16+
${SCHEMA DIAGNOSTIC} ${CSS DIAGNOSTIC}-Error[title="Property greetings is not allowed."]
1717

1818
*** Test Cases ***
1919
Pyls Configuration
@@ -41,28 +41,27 @@ Pyls Configuration
4141
Capture Page Screenshot 03-schema-diagnostic-found.png
4242
[Teardown] Clean Up After Working with File and Settings ${file}
4343

44-
# # # # # # # # # # # #
45-
# YAML schema functionality won't be available until yaml-language-server v0.7.3
46-
# # # # # # # # # # # #
47-
# YAML Schema
48-
# ${file} = Set Variable composer-schema.yaml
49-
# Prepare File for Editing YAML config ${file}
50-
# Open in Advanced Settings ${LSP PLUGIN ID}
51-
# Drag and Drop By Offset ${JLAB XP DOCK TAB}\[contains(., '${file}')] 0 100
52-
# Open Diagnostics Panel
53-
# Drag and Drop By Offset ${JLAB XP DOCK TAB}\[contains(., 'Diagnostics Panel')] 600 -200
54-
# Capture Page Screenshot 01-diagnostics-and-settings.png
55-
# Wait Until Page Contains Element ${YAML DIAGNOSTIC} timeout=20s
56-
# Page Should Not Contain ${SCHEMA DIAGNOSTIC}
57-
# Set Editor Content ${CONFIG YAML SCHEMA} ${CSS USER SETTINGS}
58-
# Click Element css:button[title\='Save User Settings']
59-
# Capture Page Screenshot 02-settings-changed.png
60-
# # TODO: ideally, the configuration should take effect immediately, but might have
61-
# # to close the document and re-open it
62-
# # Prepare File for Editing YAML config ${file}
63-
# Wait Until Page Contains Element ${SCHEMA DIAGNOSTIC} timeout=20s
64-
# Capture Page Screenshot 03-schema-diagnostic-found.png
65-
# [Teardown] Clean Up After Working with File and Settings ${file}
44+
YAML Schema
45+
${file} = Set Variable example.yaml
46+
${tab} = Set Variable ${JLAB XP DOCK TAB}\[contains(., '${file}')]
47+
Prepare File for Editing YAML config ${file}
48+
Open in Advanced Settings ${LSP PLUGIN ID}
49+
Drag and Drop By Offset ${tab} 0 100
50+
Wait Until Fully Initialized
51+
Open Diagnostics Panel
52+
Drag and Drop By Offset ${JLAB XP DOCK TAB}\[contains(., 'Diagnostics Panel')] 600 -200
53+
Ensure Sidebar Is Closed
54+
Capture Page Screenshot 01-diagnostics-and-settings.png
55+
# Diagnostic panel shouldn't show "Property ... is not allowed"
56+
Wait Until Page Contains Element ${YAML DIAGNOSTIC} timeout=20s
57+
Page Should Not Contain ${SCHEMA DIAGNOSTIC}
58+
Set Editor Content ${CONFIG YAML SCHEMA} ${CSS USER SETTINGS}
59+
Click Element css:button[title\='Save User Settings']
60+
Capture Page Screenshot 02-settings-changed.png
61+
# Now show the Composer YAML error
62+
Wait Until Page Contains Element ${SCHEMA DIAGNOSTIC} timeout=20s
63+
Capture Page Screenshot 03-schema-diagnostic-found.png
64+
[Teardown] Clean Up After Working with File and Settings ${file}
6665

6766
*** Keywords ***
6867
Clean Up After Working with File and Settings

‎atest/examples/example.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
greetings:
22
hello:
3-
hello:
3+
hello:
4+
well:

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"vscode-css-languageserver-bin": "^1.4.0",
2121
"vscode-html-languageserver-bin": "^1.4.0",
2222
"vscode-json-languageserver-bin": "^1.0.1",
23-
"yaml-language-server": "^0.4.0"
23+
"yaml-language-server": "^0.8.0"
2424
},
2525
"husky": {
2626
"hooks": {

‎yarn.lock

Lines changed: 48 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6961,7 +6961,7 @@ js-levenshtein@^1.1.3:
69616961
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
69626962
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
69636963

6964-
[email protected], js-yaml@^3.12.0, js-yaml@^3.12.1, js-yaml@^3.13.0, js-yaml@^3.13.1:
6964+
[email protected], js-yaml@^3.12.1, js-yaml@^3.13.0, js-yaml@^3.13.1:
69656965
version "3.13.1"
69666966
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
69676967
integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -7086,21 +7086,21 @@ json5@^1.0.1:
70867086
dependencies:
70877087
minimist "^1.2.0"
70887088

7089-
jsonc-parser@^1.0.0, jsonc-parser@^1.0.3:
7089+
jsonc-parser@^1.0.0:
70907090
version "1.0.3"
70917091
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.3.tgz#1d53d7160e401a783dbceabaad82473f80e6ad7e"
70927092
integrity sha512-hk/69oAeaIzchq/v3lS50PXuzn5O2ynldopMC+SWBql7J2WtdptfB9dy8Y7+Og5rPkTCpn83zTiO8FMcqlXJ/g==
70937093

7094-
jsonc-parser@^2.0.0-next.1:
7095-
version "2.2.1"
7096-
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.2.1.tgz#db73cd59d78cce28723199466b2a03d1be1df2bc"
7097-
integrity sha512-o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w==
7098-
70997094
jsonc-parser@^2.2.0:
71007095
version "2.2.0"
71017096
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.2.0.tgz#f206f87f9d49d644b7502052c04e82dd6392e9ef"
71027097
integrity sha512-4fLQxW1j/5fWj6p78vAlAafoCKtuBm6ghv+Ij5W2DrDx0qE+ZdEl2c6Ko1mgJNF5ftX1iEWQQ4Ap7+3GlhjkOA==
71037098

7099+
jsonc-parser@^2.2.1:
7100+
version "2.2.1"
7101+
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.2.1.tgz#db73cd59d78cce28723199466b2a03d1be1df2bc"
7102+
integrity sha512-o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w==
7103+
71047104
jsonfile@^4.0.0:
71057105
version "4.0.0"
71067106
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -8976,7 +8976,7 @@ prettier-linter-helpers@^1.0.0:
89768976
dependencies:
89778977
fast-diff "^1.1.2"
89788978

8979-
prettier@^1.15.2, prettier@^1.19.1:
8979+
prettier@^1.18.2, prettier@^1.19.1:
89808980
version "1.19.1"
89818981
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
89828982
integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
@@ -10077,7 +10077,7 @@ [email protected]:
1007710077
resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
1007810078
integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
1007910079

10080-
request-light@^0.2.1, request-light@^0.2.3:
10080+
request-light@^0.2.1, request-light@^0.2.4:
1008110081
version "0.2.5"
1008210082
resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.2.5.tgz#38a3da7b2e56f7af8cbba57e8a94930ee2380746"
1008310083
integrity sha512-eBEh+GzJAftUnex6tcL6eV2JCifY0+sZMIUpUPOVXbs2nV5hla4ZMmO3icYKGuGVuQ2zHE9evh4OrRcH4iyYYw==
@@ -11938,16 +11938,6 @@ vscode-json-languageserver-bin@^1.0.1:
1193811938
vscode-nls "^2.0.2"
1193911939
vscode-uri "^1.0.1"
1194011940

11941-
[email protected]:
11942-
version "3.0.12"
11943-
resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.0.12.tgz#85258632f2f7718028fbdfbb95b4ad009107b821"
11944-
integrity sha512-XSgRVY/vsPqOa//ZwLD5DWx1wzTQGgeZfsOlVqFlLya10dpimSnd27kbuL45hzxh4B+MvmHZtZeWQKjSYnNF0A==
11945-
dependencies:
11946-
jsonc-parser "^2.0.0-next.1"
11947-
vscode-languageserver-types "^3.6.1"
11948-
vscode-nls "^3.2.1"
11949-
vscode-uri "^1.0.3"
11950-
1195111941
vscode-json-languageservice@^3.0.1:
1195211942
version "3.4.11"
1195311943
resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.4.11.tgz#7c0632bccc4b2b955f99f99f43d96d3eece1de42"
@@ -11959,6 +11949,17 @@ vscode-json-languageservice@^3.0.1:
1195911949
vscode-nls "^4.1.1"
1196011950
vscode-uri "^2.1.1"
1196111951

11952+
vscode-json-languageservice@^3.6.0:
11953+
version "3.6.0"
11954+
resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.6.0.tgz#133a1e2c3a3dffe38564a1ba948516805c3c1869"
11955+
integrity sha512-dXzFywypUZ9T0tjr4fREZiknXDz6vAGx1zsxbQY1+9DOpjMfbz0VLP873KmcbuvL4K3nseKTxc4TKHu8kLXRMw==
11956+
dependencies:
11957+
jsonc-parser "^2.2.1"
11958+
vscode-languageserver-textdocument "^1.0.1"
11959+
vscode-languageserver-types "^3.15.1"
11960+
vscode-nls "^4.1.2"
11961+
vscode-uri "^2.1.1"
11962+
1196211963
[email protected]:
1196311964
version "3.5.0"
1196411965
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz#87239d9e166b2d7352245b8a813597804c1d63aa"
@@ -12024,12 +12025,17 @@ vscode-languageserver-textdocument@^1.0.0-next.5:
1202412025
resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.0.tgz#957381672eb3f507aa320e9f6d7efdfcb767d9fe"
1202512026
integrity sha512-9E3hfoknSe9wX5Bed4rFbjkWdT9Oazw+suyCQ6ZbS68r3SAwue5M7xHd9WX9jBHguAai+qmwr5dMIf7gmzQryw==
1202612027

12028+
vscode-languageserver-textdocument@^1.0.1:
12029+
version "1.0.1"
12030+
resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz#178168e87efad6171b372add1dea34f53e5d330f"
12031+
integrity sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==
12032+
1202712033
[email protected]:
1202812034
version "3.14.0"
1202912035
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
1203012036
integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
1203112037

12032-
[email protected], vscode-languageserver-types@^3.0.3, vscode-languageserver-types@^3.13.0, vscode-languageserver-types@^3.14.0, vscode-languageserver-types@^3.15.0-next.9, vscode-languageserver-types@^3.15.1, vscode-languageserver-types@^3.5.0, vscode-languageserver-types@^3.6.1, vscode-languageserver-types@^3.7.2:
12038+
[email protected], vscode-languageserver-types@^3.0.3, vscode-languageserver-types@^3.13.0, vscode-languageserver-types@^3.14.0, vscode-languageserver-types@^3.15.0-next.9, vscode-languageserver-types@^3.15.1, vscode-languageserver-types@^3.5.0, vscode-languageserver-types@^3.7.2:
1203312039
version "3.15.1"
1203412040
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz#17be71d78d2f6236d414f0001ce1ef4d23e6b6de"
1203512041
integrity sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==
@@ -12052,7 +12058,7 @@ vscode-languageserver@^3.5.0:
1205212058
vscode-languageserver-protocol "3.5.1"
1205312059
vscode-uri "^1.0.1"
1205412060

12055-
vscode-languageserver@^4.0.0, vscode-languageserver@^4.1.3:
12061+
vscode-languageserver@^4.1.3:
1205612062
version "4.4.2"
1205712063
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-4.4.2.tgz#600ae9cc7a6ff1e84d93c7807840c2cb5b22821b"
1205812064
integrity sha512-61y8Raevi9EigDgg9NelvT9cUAohiEbUl1LOwQQgOCAaNX62yKny/ddi0uC+FUTm4CzsjhBu+06R+vYgfCYReA==
@@ -12080,7 +12086,7 @@ vscode-nls@^2.0.2:
1208012086
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da"
1208112087
integrity sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto=
1208212088

12083-
vscode-nls@^3.2.1, vscode-nls@^3.2.2:
12089+
vscode-nls@^3.2.2:
1208412090
version "3.2.5"
1208512091
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4"
1208612092
integrity sha512-ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw==
@@ -12090,6 +12096,11 @@ vscode-nls@^4.0.0, vscode-nls@^4.1.1:
1209012096
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c"
1209112097
integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==
1209212098

12099+
vscode-nls@^4.1.2:
12100+
version "4.1.2"
12101+
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167"
12102+
integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==
12103+
1209312104
vscode-uri@^1.0.1, vscode-uri@^1.0.3, vscode-uri@^1.0.5, vscode-uri@^1.0.6:
1209412105
version "1.0.8"
1209512106
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59"
@@ -12462,21 +12473,22 @@ [email protected]:
1246212473
resolved "https://registry.yarnpkg.com/yaml-ast-parser-custom-tags/-/yaml-ast-parser-custom-tags-0.0.43.tgz#46968145ce4e24cb03c3312057f0f141b93a7d02"
1246312474
integrity sha512-R5063FF/JSAN6qXCmylwjt9PcDH6M0ExEme/nJBzLspc6FJDmHHIqM7xh2WfEmsTJqClF79A9VkXjkAqmZw9SQ==
1246412475

12465-
yaml-language-server@^0.4.0:
12466-
version "0.4.1"
12467-
resolved "https://registry.yarnpkg.com/yaml-language-server/-/yaml-language-server-0.4.1.tgz#746655bd1db0a109e0a5c74408983cf3c57329ee"
12468-
integrity sha512-KBGu6CvInpp2sZbAWiEqd0No7DKx8VKCvihKCcBQPIFM+eC8t02CnscsEaoMQMdvi5ceqcVzKkTgJdWPo6qi3Q==
12469-
dependencies:
12470-
js-yaml "^3.12.0"
12471-
jsonc-parser "^1.0.3"
12472-
prettier "^1.15.2"
12473-
request-light "^0.2.3"
12474-
vscode-json-languageservice "3.0.12"
12475-
vscode-languageserver "^4.0.0"
12476-
vscode-languageserver-types "^3.6.1"
12477-
vscode-nls "^3.2.2"
12478-
vscode-uri "^1.0.6"
12476+
yaml-language-server@^0.8.0:
12477+
version "0.8.0"
12478+
resolved "https://registry.yarnpkg.com/yaml-language-server/-/yaml-language-server-0.8.0.tgz#4e278b55721415f94eb9996d64a1b89f3488a28d"
12479+
integrity sha512-+mvpHHPyQo/cNnEdrydH7h13FC393FQ9Uj88W/BbTdAANDy7eTHlmqPDzvv6X5HKl5fi5RLWCWsO4SdAx0WEMw==
12480+
dependencies:
12481+
js-yaml "^3.13.1"
12482+
jsonc-parser "^2.2.1"
12483+
request-light "^0.2.4"
12484+
vscode-json-languageservice "^3.6.0"
12485+
vscode-languageserver "^5.2.1"
12486+
vscode-languageserver-types "^3.15.1"
12487+
vscode-nls "^4.1.2"
12488+
vscode-uri "^2.1.1"
1247912489
yaml-ast-parser-custom-tags "0.0.43"
12490+
optionalDependencies:
12491+
prettier "^1.18.2"
1248012492

1248112493
[email protected], yargs-parser@^10.0.0:
1248212494
version "10.1.0"

0 commit comments

Comments
 (0)