Skip to content

Focus syntax highlighting on tasks #11

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

Merged
AJGeel merged 2 commits into from
Nov 16, 2024
Merged

Focus syntax highlighting on tasks #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cc4855
Focus syntax highlighting on tasks
rick-nu Nov 15, 2024
3dc36d6
Make variables more clear
rick-nu Nov 15, 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
4 changes: 4 additions & 0 deletions src/components/Generator/GeneredTaskfile/Highlighter/highlighter.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,7 @@
.text-blue-light {
color: #93c5fd;
}

.text-green {
color: #1d8525;
}
82 changes: 72 additions & 10 deletions src/components/Generator/GeneredTaskfile/Highlighter/lineRenderers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@ import styles from './highlighter.module.css';

enum RendererType {
EmptyLines,
TaskDefinitions,
FunctionDefinitions,
Sections,
Comments,
Variables,
TaskCalls,
Conditionals,
EchoStatements,
Titles,
FunctionEnds,
}

type LineRenderer = {
Expand All @@ -21,23 +26,48 @@ export const lineRenderers: Record<RendererType, LineRenderer> = {
test: (line) => line.trim() === '',
render: (_, i) => <div key={i}>&nbsp;</div>,
},
[RendererType.FunctionDefinitions]: {
test: (line) => /^function\s+[a-zA-Z_:]+/.test(line),
[RendererType.TaskDefinitions]: {
test: (line) => /^function\stask:+[a-zA-Z-_:]+/.test(line),
render: (line, i) => {
const [, name, rest] = line.match(/^function\s+([a-zA-Z_:]+)(.*)/) || [];
const [, name, rest] = line.match(/^function\stask:+([a-zA-Z-_:]+)\s{\s##(.*)/) || [];
return (
<div key={i} className={styles.line}>
<span className={styles['text-purple']}>function </span>
<span className={styles['text-gray']}>function</span>
<span className={styles['text-white']}> task:</span>
<span className={styles['text-yellow']}>{name}</span>
<span className={styles['text-gray']}>{' {'}</span>
<span className={styles['text-green']}>{' ##'}</span>
<span className={styles['text-white']}>{rest}</span>
</div>
);
},
},
[RendererType.FunctionDefinitions]: {
test: (line) => /^function\s+[a-zA-Z-_:]+/.test(line),
render: (line, i) => {
const [, name, rest] = line.match(/^function\s+([a-zA-Z-_:]+)(.*)/) || [];
return (
<div key={i} className={styles.line}>
<span className={styles['text-gray']}>function </span>
<span className={styles['text-white']}>{name}</span>
<span className={styles['text-gray']}>{rest}</span>
</div>
);
},
},
[RendererType.Sections]: {
test: (line) => line.startsWith('## '),
render: (line, i) => (
<div key={i} className={styles.line}>
<span className={styles['text-green']}>## </span>
<span className={styles['text-white']}>{line.substring(3)}</span>
</div>
),
},
[RendererType.Comments]: {
test: (line) => line.trim().startsWith('#'),
render: (line, i) => (
<div key={i} className={styles['text-gray']}>
<div key={i} className={styles['text-green']}>
{line}
</div>
),
Expand All @@ -49,14 +79,14 @@ export const lineRenderers: Record<RendererType, LineRenderer> = {
return (
<div key={i} className={styles.line}>
<span className={styles['text-blue']}>{varName}</span>
<span className={styles['text-white']}>=</span>
<span className={styles['text-yellow-light']}>{rest.join('=')}</span>
<span className={styles['text-gray']}>=</span>
<span className={styles['text-white']}>{rest.join('=')}</span>
</div>
);
},
},
[RendererType.Conditionals]: {
test: (line) => /^\s*if\s+|^\s*then\s+|^\s*else\s+|^\s*fi\s*/.test(line),
test: (line) => /^if+|^then+|^else+|^fi/.test(line.trim()),
render: (line, i) => (
<div key={i} className={styles['text-pink']}>
{line}
Expand All @@ -69,11 +99,43 @@ export const lineRenderers: Record<RendererType, LineRenderer> = {
const parts = line.split('echo');
return (
<div key={i} className={styles.line}>
<span className={styles['text-white']}>{parts[0]}</span>
<span className={styles['text-blue-light']}>echo</span>
<span className={styles['text-white']}>{parts[0]}echo</span>
<span className={styles['text-yellow-light']}>{parts[1]}</span>
</div>
);
},
},
[RendererType.Titles]: {
test: (line) => line.trim().startsWith('title'),
render: (line, i) => {
const parts = line.split('title');
return (
<div key={i} className={styles.line}>
<span className={styles['text-white']}>{parts[0]}title</span>
<span className={styles['text-yellow-light']}>{parts[1]}</span>
</div>
);
},
},
[RendererType.TaskCalls]: {
test: (line) => /^\stask:+[a-zA-Z-_:]+/.test(line),
render: (line, i) => {
const [, space, task] = line.match(/(\s)task:+([a-zA-Z-_:]+)/) || [];

return (
<div key={i} className={styles.line}>
<span className={styles['text-white']}>{space}task:</span>
<span className={styles['text-yellow']}>{task}</span>
</div>
);
},
},
[RendererType.FunctionEnds]: {
test: (line) => line.trim().startsWith('}'),
render: (line, i) => (
<div key={i} className={styles['text-gray']}>
{line}
</div>
),
},
};
3 changes: 1 addition & 2 deletions src/components/Generator/GeneredTaskfile/taskfile-base.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ function task:help { ## Show all available tasks

function task:shorthand { ## Create CLI shorthand task instead of ./Taskfile
title "Creating task shorthand"
if [ -f /usr/local/bin/task ]
then
if [ -f /usr/local/bin/task ]; then
echo "/usr/local/bin/task already exists."
else
echo -e "You are about to create /usr/local/bin/task that requires root permission..."
Expand Down
Loading