Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Console Migration] Add styling for status codes in multiple response output #183858

Merged
merged 5 commits into from
May 28, 2024
Merged

[Console Migration] Add styling for status codes in multiple response output #183858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68faf58
[Console Migration] Add styling for status codes in multiple response…
ElenaStoeva May 20, 2024
d877913
Make status code text bold
ElenaStoeva May 21, 2024
fc84b8d
Merge branch 'main' into console-migration/multiple-response-status-c…
yuliacech May 22, 2024
4be1b6d
Merge branch 'main' into console-migration/multiple-response-status-c…
yuliacech May 23, 2024
1432360
Merge branch 'main' into console-migration/multiple-response-status-c…
yuliacech May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/kbn-monaco/src/console/lexer_rules/console_editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
consoleSharedLexerRules,
matchTokensWithEOL,
matchToken,
matchTokens,
} from './shared';
import { monaco } from '../../monaco_imports';

Expand All @@ -31,6 +32,11 @@ export const lexerRules: monaco.languages.IMonarchLanguage = {
// text
matchToken('text', '.+?'),
],
comments: [
// line comment indicated by #
matchTokens(['comment.punctuation', 'comment.line'], /(#)(.*$)/),
...consoleSharedLexerRules.tokenizer.comments,
],
method_sep: [
// protocol host with slash
matchTokensWithEOL(
Expand Down
26 changes: 25 additions & 1 deletion packages/kbn-monaco/src/console/lexer_rules/console_output.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
* Side Public License, v 1.
*/

import { consoleSharedLanguageConfiguration, consoleSharedLexerRules } from './shared';
import {
consoleSharedLanguageConfiguration,
consoleSharedLexerRules,
matchTokensWithEOL,
} from './shared';
import { monaco } from '../../monaco_imports';

export const consoleOutputLanguageConfiguration: monaco.languages.LanguageConfiguration = {
Expand All @@ -15,4 +19,24 @@ export const consoleOutputLanguageConfiguration: monaco.languages.LanguageConfig

export const consoleOutputLexerRules: monaco.languages.IMonarchLanguage = {
...consoleSharedLexerRules,
tokenizer: {
...consoleSharedLexerRules.tokenizer,
comments: [
// Line comment indicated by #
// Everything after the # character is matched, stopping right before the status code and status text at the end if they are present
matchTokensWithEOL('comment', /# .+?(?=\s+\d{3}(?: \w+)*$)/, 'root', 'status'),
...consoleSharedLexerRules.tokenizer.comments,
],
status: [
// Following HTTP response status codes conventions
// Informational responses (status codes 100 – 199)
matchTokensWithEOL('status.info', /\b1\d{2}(?: \w+)*$/, 'root'),
// Successful responses (status codes 200 – 299)
matchTokensWithEOL('status.success', /\b2\d{2}(?: \w+)*$/, 'root'),
// Redirection messages (status codes 300 – 399)
matchTokensWithEOL('status.redirect', /\b3\d{2}(?: \w+)*$/, 'root'),
// Client and server error responses (status codes 400 – 599)
matchTokensWithEOL('status.error', /\b[4-5]\d{2}(?: \w+)*$/, 'root'),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Grouped the status codes as per the HTTP status code groups. As far as I know, Es currently only uses 2**, 4**, and 5** status codes (200 OK, 201 Created, 202 Accepted, 204 No Content, 400 Bad Request, 401 Unauthorized, 403 Forbidden, 404 Not Found, 409 Conflict, 429 Too Many Requests, 500 Internal Server Error, 503 Service Unavailable). Practically only the status.success and status.error tokens will be used, but added the rest in case these status codes are added in Es.

],
},
};
2 changes: 0 additions & 2 deletions packages/kbn-monaco/src/console/lexer_rules/shared.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,6 @@ export const consoleSharedLexerRules: monaco.languages.IMonarchLanguage = {
matchToken('paren.lparen', '{', 'json_root'),
],
comments: [
// line comment indicated by #
matchTokens(['comment.punctuation', 'comment.line'], /(#)(.*$)/),
// start a block comment indicated by /*
matchToken('comment.punctuation', /\/\*/, 'block_comment'),
// line comment indicated by //
Expand Down
20 changes: 20 additions & 0 deletions packages/kbn-monaco/src/console/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,26 @@ export const buildConsoleTheme = (): monaco.editor.IStandaloneThemeData => {
['constant.numeric'],
makeHighContrastColor(euiThemeVars.euiColorAccentText)(background)
),
...buildRuleGroup(
['status.info'],
makeHighContrastColor(euiThemeVars.euiColorWarningText)(background),
true
),
...buildRuleGroup(
['status.success'],
makeHighContrastColor(euiThemeVars.euiColorSuccessText)(background),
true
),
...buildRuleGroup(
['status.redirect'],
makeHighContrastColor(euiThemeVars.euiColorWarningText)(background),
true
),
...buildRuleGroup(
['status.error'],
makeHighContrastColor(euiThemeVars.euiColorDangerText)(background),
true
),
...buildRuleGroup(['method'], makeHighContrastColor(methodTextColor)(background)),
...buildRuleGroup(['url'], makeHighContrastColor(urlTextColor)(background)),
],
Expand Down