Skip to content

Commit 800e410

Browse files
committed
added 8.3 features and renamed CoC to CoE
1 parent 73f1c42 commit 800e410

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

src/js/code/editorConfig.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ monaco.languages.setMonarchTokensProvider('robotframework', {
5959
'IF',
6060
'END',
6161
'FOR',
62+
'WHILE',
63+
'VAR',
64+
'GROUP',
6265
'IN',
6366
'IN RANGE',
6467
'IN ENUMERATE',
@@ -147,7 +150,7 @@ monaco.languages.setMonarchTokensProvider('robotframework', {
147150
[/.*?(?= {2}|[$&%@]\{|\])/, 'variable.meta.dictKey4', '@pop']
148151
],
149152
keyword: [
150-
[/(?: {2,}| ?\t ?)+(IF|END|FOR|IN|IN RANGE|IN ENUMERATE|IN ZIP|ELSE|ELSE IF|TRY|EXCEPT|FINALLY|RETURN|BREAK|WHILE|CONTINUE)(?= {2,}| ?\t ?|$)/, 'keyword', '@popall'],
153+
[/(?: {2,}| ?\t ?)+(IF|END|FOR|WHILE|VAR|GROUP|IN|IN RANGE|IN ENUMERATE|IN ZIP|ELSE|ELSE IF|TRY|EXCEPT|FINALLY|RETURN|BREAK|WHILE|CONTINUE)(?= {2,}| ?\t ?|$)/, 'keyword', '@popall'],
151154
[/^(?: {2,}| ?\t ?)+[^@$%&]*?(?= {2,}| ?\t ?| ?$)/, 'identifier.keyword1', '@popall'],
152155
[/^(?:(?:(?: {2,}| ?\t ?)(?:[$&@]\{(?:.*?)\}(?: ?=)))*(?: {2,}| ?\t ?))(.+?)(?= {2,}| ?\t ?|$)/, 'identifier.keyword3', '@popall']
153156
],
@@ -276,6 +279,7 @@ function createSettingsProposals(settingsLines, range) {
276279
'Test Teardown',
277280
'Test Template',
278281
'Test Timeout',
282+
'Test Tags',
279283
'Force Tags',
280284
'Default Tags'
281285
]
@@ -318,6 +322,7 @@ function createTCKWSettingProposals(range, currentTable, lines) {
318322
'[Documentation] ',
319323
'[Tags] ',
320324
'[Arguments] ',
325+
'[Setup] ',
321326
'[Teardown] '
322327
]
323328

@@ -326,6 +331,8 @@ function createTCKWSettingProposals(range, currentTable, lines) {
326331
'ELSE',
327332
'ELSE IF ',
328333
'FOR ',
334+
'VAR ',
335+
'GROUP ',
329336
'END',
330337
'WHILE ',
331338
'RETURN ',

src/views/CoC.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</router-link>
1010
</div>
1111
<h2>
12-
Robot Framework Code of Conduct
12+
Robot Framework Code of Ethics
1313
</h2>
1414
<p>
1515
ROBOT FRAMEWORK FOUNDATION is dedicated to providing a harassment-free experience for everyone,
@@ -18,8 +18,8 @@
1818
form.
1919
</p>
2020
<p>
21-
This code of conduct applies to all ROBOT FRAMEWORK spaces, both online and off.
22-
Anyone who violates this code of conduct may be sanctioned or expelled from these spaces at the
21+
This code of ethics applies to all ROBOT FRAMEWORK spaces, both online and off.
22+
Anyone who violates this code of ethics may be sanctioned or expelled from these spaces at the
2323
discretion of the Robot Framework board.
2424
</p>
2525
<p>
@@ -103,7 +103,7 @@
103103
If you are being harassed by a member of ROBOT FRAMEWORK, notice that someone else is being harassed, or have any other concerns, please contact <a style="display: inline;" href="mailto: awareness@robotframework.org">awareness@robotframework.org</a>. If the person who is harassing you is on the team, they will recuse themselves from handling your incident. We will respond as promptly as we can.
104104
</li>
105105
<li>
106-
This code of conduct applies to ROBOT FRAMEWORK spaces, but if you are being harassed by a member of ROBOT FRAMEWORK outside our spaces, we still want to know about it. We will take all good-faith reports of harassment by ROBOT FRAMEWORK members seriously. This includes harassment outside our spaces and harassment that took place at any point in time. The abuse team reserves the right to exclude people from ROBOT FRAMEWORK based on their past behaviour, including behaviour outside ROBOT FRAMEWORK spaces and behaviour towards people who are not in ROBOT FRAMEWORK community.
106+
This code of ethics applies to ROBOT FRAMEWORK spaces, but if you are being harassed by a member of ROBOT FRAMEWORK outside our spaces, we still want to know about it. We will take all good-faith reports of harassment by ROBOT FRAMEWORK members seriously. This includes harassment outside our spaces and harassment that took place at any point in time. The abuse team reserves the right to exclude people from ROBOT FRAMEWORK based on their past behaviour, including behaviour outside ROBOT FRAMEWORK spaces and behaviour towards people who are not in ROBOT FRAMEWORK community.
107107
</li>
108108
<li>
109109
In order to protect volunteers from abuse and burnout, we reserve the right to reject any report we believe to have been made in bad faith. Reports intended to silence legitimate criticism may be deleted without response.

0 commit comments

Comments
 (0)