Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/workflows/callstack-reviewer.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
name: Callstack.ai PR Review

on:
workflow_dispatch:
inputs:
config:
type: string
description: "config for reviewer"
required: true
head:
type: string
description: "head commit sha"
required: true
base:
type: string
description: "base commit sha"
required: false

jobs:
callstack_pr_review_job:
runs-on: ubuntu-latest
steps:
- name: Review PR
uses: callstackai/action@v1.0.7
with:
config: ${{ inputs.config }}
head: ${{ inputs.head }}
openai_key: ${{ secrets.OPENAI_KEY_2 }}
export: /code/chats.json
channel: pre-release
tag: develop
31 changes: 31 additions & 0 deletions .github/workflows/callstack-reviewer.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
name: Callstack.ai PR Review

on:
workflow_dispatch:
inputs:
config:
type: string
description: "config for reviewer"
required: true
head:
type: string
description: "head commit sha"
required: true
base:
type: string
description: "base commit sha"
required: false

jobs:
callstack_pr_review_job:
runs-on: ubuntu-latest
steps:
- name: Review PR
uses: callstackai/action@v1.0.7
with:
config: ${{ inputs.config }}
head: ${{ inputs.head }}
openai_key: ${{ secrets.OPENAI_KEY_2 }}
export: /code/chats.json
channel: pre-release
tag: develop
2 changes: 1 addition & 1 deletion website/css/style.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -347,7 +347,7 @@ li.entry {
}

.CodeMirror .marked,
.entry.focused {
.entry.highlighted {
border-radius: 2px;
background-color: rgba(255,240,6,0.4);
}
Expand Down
20 changes: 5 additions & 15 deletions website/src/components/ASTOutput.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,8 @@ import PropTypes from 'prop-types';
import React from 'react';
import cx from 'classnames';
import visualizations from './visualization';
import getFocusPath from './getFocusPath';

const {useState, useMemo} = React;
const {useState} = React;

function formatTime(time) {
if (!time) {
Expand All@@ -16,17 +15,9 @@ function formatTime(time) {
return `${(time / 1000).toFixed(2)}s`;
}

export default function ASTOutput({parser, parseResult={}, cursor=null}) {
export default function ASTOutput({parseResult={}, position=null}) {
const [selectedOutput, setSelectedOutput] = useState(0);
const {ast=null} = parseResult;

const focusPath = useMemo(
() => ast && cursor != null ?
getFocusPath(parseResult.ast, cursor, parser) :
[],
[ast, cursor, parser],
);

let output;

if (parseResult.error) {
Expand All@@ -40,7 +31,7 @@ export default function ASTOutput({parser, parseResult={}, cursor=null}) {
{
React.createElement(
visualizations[selectedOutput],
{parseResult, focusPath}
{parseResult, position}
)
}
</ErrorBoundary>
Expand DownExpand Up@@ -68,15 +59,14 @@ export default function ASTOutput({parser, parseResult={}, cursor=null}) {
{formatTime(parseResult.time)}
</span>
</div>
{output}
{output}
</div>
);
}

ASTOutput.propTypes = {
parser: PropTypes.object.isRequired,
parseResult: PropTypes.object,
cursor: PropTypes.any,
position: PropTypes.number,
};

class ErrorBoundary extends React.Component {
Expand Down
45 changes: 0 additions & 45 deletions website/src/components/getFocusPath.js

This file was deleted.

32 changes: 32 additions & 0 deletions website/src/components/visualization/SelectedNodeContext.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
import React from 'react';

const SelectedNodeContext = React.createContext();

function useSelectedNode() {
const context = React.useContext(SelectedNodeContext);
if (!context) {
throw new Error('useSelectedNode must be used within a SelectedNodeContext');
}
return context;
}

let unselectCallback;

function setSelectedNode(node, cb) {
if (unselectCallback) {
unselectCallback();
}
if (node) {
global.$node = node;
unselectCallback = cb;
} else {
unselectCallback = null;
delete global.$node;
}
}

function SelectedNodeProvider(props) {
return <SelectedNodeContext.Provider value={setSelectedNode} {...props} />;
}

export {SelectedNodeProvider, useSelectedNode};
33 changes: 21 additions & 12 deletions website/src/components/visualization/Tree.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,12 @@ import React from 'react';
import PubSub from 'pubsub-js';
import {logEvent} from '../../utils/logger';
import {treeAdapterFromParseResult} from '../../core/TreeAdapter.js';
import {SelectedNodeProvider} from './SelectedNodeContext.js';
import focusNodes from './focusNodes.js'

import './css/tree.css'

const {useReducer, useMemo} = React;
const {useReducer, useMemo, useRef, useLayoutEffect} = React;

const STORAGE_KEY = 'tree_settings';

Expand DownExpand Up@@ -48,12 +50,18 @@ function makeCheckbox(name, settings, updateSettings) {
);
}

export default function Tree({focusPath, parseResult}) {
export default function Tree({parseResult, position}) {
const [settings, updateSettings] = useReducer(reducer, null, initSettings);
const treeAdapter = useMemo(
() => treeAdapterFromParseResult(parseResult, settings),
[parseResult.treeAdapter, settings],
);
const rootElement = useRef();

focusNodes('init');
useLayoutEffect(() => {
focusNodes('focus', rootElement);
});

return (
<div className="tree-visualization container">
Expand All@@ -73,21 +81,22 @@ export default function Tree({focusPath, parseResult}) {
</span>
))}
</div>
<ul onMouseLeave={() => {PubSub.publish('CLEAR_HIGHLIGHT');}}>
<Element
focusPath={focusPath}
value={parseResult.ast}
level={0}
treeAdapter={treeAdapter}
settings={settings}
/>
<ul ref={rootElement} onMouseLeave={() => {PubSub.publish('CLEAR_HIGHLIGHT');}}>
<SelectedNodeProvider>
<Element
value={parseResult.ast}
level={0}
treeAdapter={treeAdapter}
autofocus={settings.autofocus}
position={position}
/>
</SelectedNodeProvider>
</ul>
</div>
);
}

Tree.propTypes = {
focusPath: PropTypes.array,
parseResult: PropTypes.object,
parser: PropTypes.object,
position: PropTypes.number,
};
65 changes: 65 additions & 0 deletions website/src/components/visualization/focusNodes.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
/**
* This may be a horrible way to do it, but this function is called from React
* components to "collect" all elements that represent AST nodes that are
* currently "focused", i.e. the position of the caret corresponds with this
* node.
* Since a node can appear multiple times in the parser output, multiple elements
* can be highlighted. The question is: which element should we scroll to?
* My current answer: The one that is closest to the center vertical center of
* the view.
* React components cannot solve this themselves since they don't have knowledge
* over other elements.
* So this function works as follows:
* - At render, the tree root initializes a new set of nodes.
* - Whenever a child node is rendered and "in focus", it adds a ref to the
* list of elements.
* - After render, the tree root triggers the focus logic. The element that is
* closest to the center is scrolled into the view.
*/
let nodes;

export default function(message, arg) {
switch (message) {
case 'init':
nodes = new Set();
break;
case 'add':
nodes.add(arg);
break;
case 'focus': {
const root = arg.current;
const size = nodes.size;
try {
if (size === 1) {
nodes.values().next().value.current.scrollIntoView();
} else if (size > 1) {
const rootRect = root.getBoundingClientRect();
const center = (rootRect.y + rootRect.height) / 2 + rootRect.y;

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🐛 Bug
The calculation of the center on line 37 is incorrect. It adds rootRect.y twice, which will result in an incorrect vertical center. This will lead to inaccurate determination of which element to scroll into view.

Suggested change
constcenter=(rootRect.y+rootRect.height)/2+rootRect.y;
constcenter=(rootRect.y+rootRect.height)/2;

const closest = Array.from(nodes).reduce((closest, element) => {
if (!element.current) {
return closest;
}
const elementRect = element.current.getBoundingClientRect();
const distance = elementRect.y - center;
const minDistance = Math.min(
Math.abs(distance),
Math.abs(distance + elementRect.height)
);

if (!closest || closest[1] > minDistance) {
return [element.current, minDistance];
}
return closest;
}, null);
if (closest) {
closest[0].scrollIntoView();
}
}
} catch (e) {
// eslint-disable-next-line no-console
console.error('Unable to scroll node into view:', e.message);
}

}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Autofocus by hackal · Pull Request #9 · CallstackAI/astexplorer · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/workflows/callstack-reviewer.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
name: Callstack.ai PR Review

on:
workflow_dispatch:
inputs:
config:
type: string
description: "config for reviewer"
required: true
head:
type: string
description: "head commit sha"
required: true
base:
type: string
description: "base commit sha"
required: false

jobs:
callstack_pr_review_job:
runs-on: ubuntu-latest
steps:
- name: Review PR
uses: callstackai/action@v1.0.7
with:
config: ${{ inputs.config }}
head: ${{ inputs.head }}
openai_key: ${{ secrets.OPENAI_KEY_2 }}
export: /code/chats.json
channel: pre-release
tag: develop
31 changes: 31 additions & 0 deletions .github/workflows/callstack-reviewer.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
name: Callstack.ai PR Review

on:
workflow_dispatch:
inputs:
config:
type: string
description: "config for reviewer"
required: true
head:
type: string
description: "head commit sha"
required: true
base:
type: string
description: "base commit sha"
required: false

jobs:
callstack_pr_review_job:
runs-on: ubuntu-latest
steps:
- name: Review PR
uses: callstackai/action@v1.0.7
with:
config: ${{ inputs.config }}
head: ${{ inputs.head }}
openai_key: ${{ secrets.OPENAI_KEY_2 }}
export: /code/chats.json
channel: pre-release
tag: develop
2 changes: 1 addition & 1 deletion website/css/style.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -347,7 +347,7 @@ li.entry {
}

.CodeMirror .marked,
.entry.focused {
.entry.highlighted {
border-radius: 2px;
background-color: rgba(255,240,6,0.4);
}
Expand Down
20 changes: 5 additions & 15 deletions website/src/components/ASTOutput.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,8 @@ import PropTypes from 'prop-types';
import React from 'react';
import cx from 'classnames';
import visualizations from './visualization';
import getFocusPath from './getFocusPath';

const {useState, useMemo} = React;
const {useState} = React;

function formatTime(time) {
if (!time) {
Expand All@@ -16,17 +15,9 @@ function formatTime(time) {
return `${(time / 1000).toFixed(2)}s`;
}

export default function ASTOutput({parser, parseResult={}, cursor=null}) {
export default function ASTOutput({parseResult={}, position=null}) {
const [selectedOutput, setSelectedOutput] = useState(0);
const {ast=null} = parseResult;

const focusPath = useMemo(
() => ast && cursor != null ?
getFocusPath(parseResult.ast, cursor, parser) :
[],
[ast, cursor, parser],
);

let output;

if (parseResult.error) {
Expand All@@ -40,7 +31,7 @@ export default function ASTOutput({parser, parseResult={}, cursor=null}) {
{
React.createElement(
visualizations[selectedOutput],
{parseResult, focusPath}
{parseResult, position}
)
}
</ErrorBoundary>
Expand DownExpand Up@@ -68,15 +59,14 @@ export default function ASTOutput({parser, parseResult={}, cursor=null}) {
{formatTime(parseResult.time)}
</span>
</div>
{output}
{output}
</div>
);
}

ASTOutput.propTypes = {
parser: PropTypes.object.isRequired,
parseResult: PropTypes.object,
cursor: PropTypes.any,
position: PropTypes.number,
};

class ErrorBoundary extends React.Component {
Expand Down
45 changes: 0 additions & 45 deletions website/src/components/getFocusPath.js

This file was deleted.

32 changes: 32 additions & 0 deletions website/src/components/visualization/SelectedNodeContext.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
import React from 'react';

const SelectedNodeContext = React.createContext();

function useSelectedNode() {
const context = React.useContext(SelectedNodeContext);
if (!context) {
throw new Error('useSelectedNode must be used within a SelectedNodeContext');
}
return context;
}

let unselectCallback;

function setSelectedNode(node, cb) {
if (unselectCallback) {
unselectCallback();
}
if (node) {
global.$node = node;
unselectCallback = cb;
} else {
unselectCallback = null;
delete global.$node;
}
}

function SelectedNodeProvider(props) {
return <SelectedNodeContext.Provider value={setSelectedNode} {...props} />;
}

export {SelectedNodeProvider, useSelectedNode};
33 changes: 21 additions & 12 deletions website/src/components/visualization/Tree.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,12 @@ import React from 'react';
import PubSub from 'pubsub-js';
import {logEvent} from '../../utils/logger';
import {treeAdapterFromParseResult} from '../../core/TreeAdapter.js';
import {SelectedNodeProvider} from './SelectedNodeContext.js';
import focusNodes from './focusNodes.js'

import './css/tree.css'

const {useReducer, useMemo} = React;
const {useReducer, useMemo, useRef, useLayoutEffect} = React;

const STORAGE_KEY = 'tree_settings';

Expand DownExpand Up@@ -48,12 +50,18 @@ function makeCheckbox(name, settings, updateSettings) {
);
}

export default function Tree({focusPath, parseResult}) {
export default function Tree({parseResult, position}) {
const [settings, updateSettings] = useReducer(reducer, null, initSettings);
const treeAdapter = useMemo(
() => treeAdapterFromParseResult(parseResult, settings),
[parseResult.treeAdapter, settings],
);
const rootElement = useRef();

focusNodes('init');
useLayoutEffect(() => {
focusNodes('focus', rootElement);
});

return (
<div className="tree-visualization container">
Expand All@@ -73,21 +81,22 @@ export default function Tree({focusPath, parseResult}) {
</span>
))}
</div>
<ul onMouseLeave={() => {PubSub.publish('CLEAR_HIGHLIGHT');}}>
<Element
focusPath={focusPath}
value={parseResult.ast}
level={0}
treeAdapter={treeAdapter}
settings={settings}
/>
<ul ref={rootElement} onMouseLeave={() => {PubSub.publish('CLEAR_HIGHLIGHT');}}>
<SelectedNodeProvider>
<Element
value={parseResult.ast}
level={0}
treeAdapter={treeAdapter}
autofocus={settings.autofocus}
position={position}
/>
</SelectedNodeProvider>
</ul>
</div>
);
}

Tree.propTypes = {
focusPath: PropTypes.array,
parseResult: PropTypes.object,
parser: PropTypes.object,
position: PropTypes.number,
};
65 changes: 65 additions & 0 deletions website/src/components/visualization/focusNodes.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
/**
* This may be a horrible way to do it, but this function is called from React
* components to "collect" all elements that represent AST nodes that are
* currently "focused", i.e. the position of the caret corresponds with this
* node.
* Since a node can appear multiple times in the parser output, multiple elements
* can be highlighted. The question is: which element should we scroll to?
* My current answer: The one that is closest to the center vertical center of
* the view.
* React components cannot solve this themselves since they don't have knowledge
* over other elements.
* So this function works as follows:
* - At render, the tree root initializes a new set of nodes.
* - Whenever a child node is rendered and "in focus", it adds a ref to the
* list of elements.
* - After render, the tree root triggers the focus logic. The element that is
* closest to the center is scrolled into the view.
*/
let nodes;

export default function(message, arg) {
switch (message) {
case 'init':
nodes = new Set();
break;
case 'add':
nodes.add(arg);
break;
case 'focus': {
const root = arg.current;
const size = nodes.size;
try {
if (size === 1) {
nodes.values().next().value.current.scrollIntoView();
} else if (size > 1) {
const rootRect = root.getBoundingClientRect();
const center = (rootRect.y + rootRect.height) / 2 + rootRect.y;

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🐛 Bug
The calculation of the center on line 37 is incorrect. It adds rootRect.y twice, which will result in an incorrect vertical center. This will lead to inaccurate determination of which element to scroll into view.

Suggested change
constcenter=(rootRect.y+rootRect.height)/2+rootRect.y;
constcenter=(rootRect.y+rootRect.height)/2;

const closest = Array.from(nodes).reduce((closest, element) => {
if (!element.current) {
return closest;
}
const elementRect = element.current.getBoundingClientRect();
const distance = elementRect.y - center;
const minDistance = Math.min(
Math.abs(distance),
Math.abs(distance + elementRect.height)
);

if (!closest || closest[1] > minDistance) {
return [element.current, minDistance];
}
return closest;
}, null);
if (closest) {
closest[0].scrollIntoView();
}
}
} catch (e) {
// eslint-disable-next-line no-console
console.error('Unable to scroll node into view:', e.message);
}

}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Autofocus by hackal · Pull Request #9 · CallstackAI/astexplorer · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/workflows/callstack-reviewer.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
name: Callstack.ai PR Review

on:
workflow_dispatch:
inputs:
config:
type: string
description: "config for reviewer"
required: true
head:
type: string
description: "head commit sha"
required: true
base:
type: string
description: "base commit sha"
required: false

jobs:
callstack_pr_review_job:
runs-on: ubuntu-latest
steps:
- name: Review PR
uses: callstackai/action@v1.0.7
with:
config: ${{ inputs.config }}
head: ${{ inputs.head }}
openai_key: ${{ secrets.OPENAI_KEY_2 }}
export: /code/chats.json
channel: pre-release
tag: develop
31 changes: 31 additions & 0 deletions .github/workflows/callstack-reviewer.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
name: Callstack.ai PR Review

on:
workflow_dispatch:
inputs:
config:
type: string
description: "config for reviewer"
required: true
head:
type: string
description: "head commit sha"
required: true
base:
type: string
description: "base commit sha"
required: false

jobs:
callstack_pr_review_job:
runs-on: ubuntu-latest
steps:
- name: Review PR
uses: callstackai/action@v1.0.7
with:
config: ${{ inputs.config }}
head: ${{ inputs.head }}
openai_key: ${{ secrets.OPENAI_KEY_2 }}
export: /code/chats.json
channel: pre-release
tag: develop
2 changes: 1 addition & 1 deletion website/css/style.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -347,7 +347,7 @@ li.entry {
}

.CodeMirror .marked,
.entry.focused {
.entry.highlighted {
border-radius: 2px;
background-color: rgba(255,240,6,0.4);
}
Expand Down
20 changes: 5 additions & 15 deletions website/src/components/ASTOutput.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,8 @@ import PropTypes from 'prop-types';
import React from 'react';
import cx from 'classnames';
import visualizations from './visualization';
import getFocusPath from './getFocusPath';

const {useState, useMemo} = React;
const {useState} = React;

function formatTime(time) {
if (!time) {
Expand All@@ -16,17 +15,9 @@ function formatTime(time) {
return `${(time / 1000).toFixed(2)}s`;
}

export default function ASTOutput({parser, parseResult={}, cursor=null}) {
export default function ASTOutput({parseResult={}, position=null}) {
const [selectedOutput, setSelectedOutput] = useState(0);
const {ast=null} = parseResult;

const focusPath = useMemo(
() => ast && cursor != null ?
getFocusPath(parseResult.ast, cursor, parser) :
[],
[ast, cursor, parser],
);

let output;

if (parseResult.error) {
Expand All@@ -40,7 +31,7 @@ export default function ASTOutput({parser, parseResult={}, cursor=null}) {
{
React.createElement(
visualizations[selectedOutput],
{parseResult, focusPath}
{parseResult, position}
)
}
</ErrorBoundary>
Expand DownExpand Up@@ -68,15 +59,14 @@ export default function ASTOutput({parser, parseResult={}, cursor=null}) {
{formatTime(parseResult.time)}
</span>
</div>
{output}
{output}
</div>
);
}

ASTOutput.propTypes = {
parser: PropTypes.object.isRequired,
parseResult: PropTypes.object,
cursor: PropTypes.any,
position: PropTypes.number,
};

class ErrorBoundary extends React.Component {
Expand Down
45 changes: 0 additions & 45 deletions website/src/components/getFocusPath.js

This file was deleted.

32 changes: 32 additions & 0 deletions website/src/components/visualization/SelectedNodeContext.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
import React from 'react';

const SelectedNodeContext = React.createContext();

function useSelectedNode() {
const context = React.useContext(SelectedNodeContext);
if (!context) {
throw new Error('useSelectedNode must be used within a SelectedNodeContext');
}
return context;
}

let unselectCallback;

function setSelectedNode(node, cb) {
if (unselectCallback) {
unselectCallback();
}
if (node) {
global.$node = node;
unselectCallback = cb;
} else {
unselectCallback = null;
delete global.$node;
}
}

function SelectedNodeProvider(props) {
return <SelectedNodeContext.Provider value={setSelectedNode} {...props} />;
}

export {SelectedNodeProvider, useSelectedNode};
33 changes: 21 additions & 12 deletions website/src/components/visualization/Tree.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,12 @@ import React from 'react';
import PubSub from 'pubsub-js';
import {logEvent} from '../../utils/logger';
import {treeAdapterFromParseResult} from '../../core/TreeAdapter.js';
import {SelectedNodeProvider} from './SelectedNodeContext.js';
import focusNodes from './focusNodes.js'

import './css/tree.css'

const {useReducer, useMemo} = React;
const {useReducer, useMemo, useRef, useLayoutEffect} = React;

const STORAGE_KEY = 'tree_settings';

Expand DownExpand Up@@ -48,12 +50,18 @@ function makeCheckbox(name, settings, updateSettings) {
);
}

export default function Tree({focusPath, parseResult}) {
export default function Tree({parseResult, position}) {
const [settings, updateSettings] = useReducer(reducer, null, initSettings);
const treeAdapter = useMemo(
() => treeAdapterFromParseResult(parseResult, settings),
[parseResult.treeAdapter, settings],
);
const rootElement = useRef();

focusNodes('init');
useLayoutEffect(() => {
focusNodes('focus', rootElement);
});

return (
<div className="tree-visualization container">
Expand All@@ -73,21 +81,22 @@ export default function Tree({focusPath, parseResult}) {
</span>
))}
</div>
<ul onMouseLeave={() => {PubSub.publish('CLEAR_HIGHLIGHT');}}>
<Element
focusPath={focusPath}
value={parseResult.ast}
level={0}
treeAdapter={treeAdapter}
settings={settings}
/>
<ul ref={rootElement} onMouseLeave={() => {PubSub.publish('CLEAR_HIGHLIGHT');}}>
<SelectedNodeProvider>
<Element
value={parseResult.ast}
level={0}
treeAdapter={treeAdapter}
autofocus={settings.autofocus}
position={position}
/>
</SelectedNodeProvider>
</ul>
</div>
);
}

Tree.propTypes = {
focusPath: PropTypes.array,
parseResult: PropTypes.object,
parser: PropTypes.object,
position: PropTypes.number,
};
65 changes: 65 additions & 0 deletions website/src/components/visualization/focusNodes.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
/**
* This may be a horrible way to do it, but this function is called from React
* components to "collect" all elements that represent AST nodes that are
* currently "focused", i.e. the position of the caret corresponds with this
* node.
* Since a node can appear multiple times in the parser output, multiple elements
* can be highlighted. The question is: which element should we scroll to?
* My current answer: The one that is closest to the center vertical center of
* the view.
* React components cannot solve this themselves since they don't have knowledge
* over other elements.
* So this function works as follows:
* - At render, the tree root initializes a new set of nodes.
* - Whenever a child node is rendered and "in focus", it adds a ref to the
* list of elements.
* - After render, the tree root triggers the focus logic. The element that is
* closest to the center is scrolled into the view.
*/
let nodes;

export default function(message, arg) {
switch (message) {
case 'init':
nodes = new Set();
break;
case 'add':
nodes.add(arg);
break;
case 'focus': {
const root = arg.current;
const size = nodes.size;
try {
if (size === 1) {
nodes.values().next().value.current.scrollIntoView();
} else if (size > 1) {
const rootRect = root.getBoundingClientRect();
const center = (rootRect.y + rootRect.height) / 2 + rootRect.y;

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🐛 Bug
The calculation of the center on line 37 is incorrect. It adds rootRect.y twice, which will result in an incorrect vertical center. This will lead to inaccurate determination of which element to scroll into view.

Suggested change
constcenter=(rootRect.y+rootRect.height)/2+rootRect.y;
constcenter=(rootRect.y+rootRect.height)/2;

const closest = Array.from(nodes).reduce((closest, element) => {
if (!element.current) {
return closest;
}
const elementRect = element.current.getBoundingClientRect();
const distance = elementRect.y - center;
const minDistance = Math.min(
Math.abs(distance),
Math.abs(distance + elementRect.height)
);

if (!closest || closest[1] > minDistance) {
return [element.current, minDistance];
}
return closest;
}, null);
if (closest) {
closest[0].scrollIntoView();
}
}
} catch (e) {
// eslint-disable-next-line no-console
console.error('Unable to scroll node into view:', e.message);
}

}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Autofocus by hackal · Pull Request #9 · CallstackAI/astexplorer · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/workflows/callstack-reviewer.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
name: Callstack.ai PR Review

on:
workflow_dispatch:
inputs:
config:
type: string
description: "config for reviewer"
required: true
head:
type: string
description: "head commit sha"
required: true
base:
type: string
description: "base commit sha"
required: false

jobs:
callstack_pr_review_job:
runs-on: ubuntu-latest
steps:
- name: Review PR
uses: callstackai/action@v1.0.7
with:
config: ${{ inputs.config }}
head: ${{ inputs.head }}
openai_key: ${{ secrets.OPENAI_KEY_2 }}
export: /code/chats.json
channel: pre-release
tag: develop
31 changes: 31 additions & 0 deletions .github/workflows/callstack-reviewer.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
name: Callstack.ai PR Review

on:
workflow_dispatch:
inputs:
config:
type: string
description: "config for reviewer"
required: true
head:
type: string
description: "head commit sha"
required: true
base:
type: string
description: "base commit sha"
required: false

jobs:
callstack_pr_review_job:
runs-on: ubuntu-latest
steps:
- name: Review PR
uses: callstackai/action@v1.0.7
with:
config: ${{ inputs.config }}
head: ${{ inputs.head }}
openai_key: ${{ secrets.OPENAI_KEY_2 }}
export: /code/chats.json
channel: pre-release
tag: develop
2 changes: 1 addition & 1 deletion website/css/style.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -347,7 +347,7 @@ li.entry {
}

.CodeMirror .marked,
.entry.focused {
.entry.highlighted {
border-radius: 2px;
background-color: rgba(255,240,6,0.4);
}
Expand Down
20 changes: 5 additions & 15 deletions website/src/components/ASTOutput.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,8 @@ import PropTypes from 'prop-types';
import React from 'react';
import cx from 'classnames';
import visualizations from './visualization';
import getFocusPath from './getFocusPath';

const {useState, useMemo} = React;
const {useState} = React;

function formatTime(time) {
if (!time) {
Expand All@@ -16,17 +15,9 @@ function formatTime(time) {
return `${(time / 1000).toFixed(2)}s`;
}

export default function ASTOutput({parser, parseResult={}, cursor=null}) {
export default function ASTOutput({parseResult={}, position=null}) {
const [selectedOutput, setSelectedOutput] = useState(0);
const {ast=null} = parseResult;

const focusPath = useMemo(
() => ast && cursor != null ?
getFocusPath(parseResult.ast, cursor, parser) :
[],
[ast, cursor, parser],
);

let output;

if (parseResult.error) {
Expand All@@ -40,7 +31,7 @@ export default function ASTOutput({parser, parseResult={}, cursor=null}) {
{
React.createElement(
visualizations[selectedOutput],
{parseResult, focusPath}
{parseResult, position}
)
}
</ErrorBoundary>
Expand DownExpand Up@@ -68,15 +59,14 @@ export default function ASTOutput({parser, parseResult={}, cursor=null}) {
{formatTime(parseResult.time)}
</span>
</div>
{output}
{output}
</div>
);
}

ASTOutput.propTypes = {
parser: PropTypes.object.isRequired,
parseResult: PropTypes.object,
cursor: PropTypes.any,
position: PropTypes.number,
};

class ErrorBoundary extends React.Component {
Expand Down
45 changes: 0 additions & 45 deletions website/src/components/getFocusPath.js

This file was deleted.

32 changes: 32 additions & 0 deletions website/src/components/visualization/SelectedNodeContext.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
import React from 'react';

const SelectedNodeContext = React.createContext();

function useSelectedNode() {
const context = React.useContext(SelectedNodeContext);
if (!context) {
throw new Error('useSelectedNode must be used within a SelectedNodeContext');
}
return context;
}

let unselectCallback;

function setSelectedNode(node, cb) {
if (unselectCallback) {
unselectCallback();
}
if (node) {
global.$node = node;
unselectCallback = cb;
} else {
unselectCallback = null;
delete global.$node;
}
}

function SelectedNodeProvider(props) {
return <SelectedNodeContext.Provider value={setSelectedNode} {...props} />;
}

export {SelectedNodeProvider, useSelectedNode};
33 changes: 21 additions & 12 deletions website/src/components/visualization/Tree.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,12 @@ import React from 'react';
import PubSub from 'pubsub-js';
import {logEvent} from '../../utils/logger';
import {treeAdapterFromParseResult} from '../../core/TreeAdapter.js';
import {SelectedNodeProvider} from './SelectedNodeContext.js';
import focusNodes from './focusNodes.js'

import './css/tree.css'

const {useReducer, useMemo} = React;
const {useReducer, useMemo, useRef, useLayoutEffect} = React;

const STORAGE_KEY = 'tree_settings';

Expand DownExpand Up@@ -48,12 +50,18 @@ function makeCheckbox(name, settings, updateSettings) {
);
}

export default function Tree({focusPath, parseResult}) {
export default function Tree({parseResult, position}) {
const [settings, updateSettings] = useReducer(reducer, null, initSettings);
const treeAdapter = useMemo(
() => treeAdapterFromParseResult(parseResult, settings),
[parseResult.treeAdapter, settings],
);
const rootElement = useRef();

focusNodes('init');
useLayoutEffect(() => {
focusNodes('focus', rootElement);
});

return (
<div className="tree-visualization container">
Expand All@@ -73,21 +81,22 @@ export default function Tree({focusPath, parseResult}) {
</span>
))}
</div>
<ul onMouseLeave={() => {PubSub.publish('CLEAR_HIGHLIGHT');}}>
<Element
focusPath={focusPath}
value={parseResult.ast}
level={0}
treeAdapter={treeAdapter}
settings={settings}
/>
<ul ref={rootElement} onMouseLeave={() => {PubSub.publish('CLEAR_HIGHLIGHT');}}>
<SelectedNodeProvider>
<Element
value={parseResult.ast}
level={0}
treeAdapter={treeAdapter}
autofocus={settings.autofocus}
position={position}
/>
</SelectedNodeProvider>
</ul>
</div>
);
}

Tree.propTypes = {
focusPath: PropTypes.array,
parseResult: PropTypes.object,
parser: PropTypes.object,
position: PropTypes.number,
};
65 changes: 65 additions & 0 deletions website/src/components/visualization/focusNodes.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
/**
* This may be a horrible way to do it, but this function is called from React
* components to "collect" all elements that represent AST nodes that are
* currently "focused", i.e. the position of the caret corresponds with this
* node.
* Since a node can appear multiple times in the parser output, multiple elements
* can be highlighted. The question is: which element should we scroll to?
* My current answer: The one that is closest to the center vertical center of
* the view.
* React components cannot solve this themselves since they don't have knowledge
* over other elements.
* So this function works as follows:
* - At render, the tree root initializes a new set of nodes.
* - Whenever a child node is rendered and "in focus", it adds a ref to the
* list of elements.
* - After render, the tree root triggers the focus logic. The element that is
* closest to the center is scrolled into the view.
*/
let nodes;

export default function(message, arg) {
switch (message) {
case 'init':
nodes = new Set();
break;
case 'add':
nodes.add(arg);
break;
case 'focus': {
const root = arg.current;
const size = nodes.size;
try {
if (size === 1) {
nodes.values().next().value.current.scrollIntoView();
} else if (size > 1) {
const rootRect = root.getBoundingClientRect();
const center = (rootRect.y + rootRect.height) / 2 + rootRect.y;

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🐛 Bug
The calculation of the center on line 37 is incorrect. It adds rootRect.y twice, which will result in an incorrect vertical center. This will lead to inaccurate determination of which element to scroll into view.

Suggested change
constcenter=(rootRect.y+rootRect.height)/2+rootRect.y;
constcenter=(rootRect.y+rootRect.height)/2;

const closest = Array.from(nodes).reduce((closest, element) => {
if (!element.current) {
return closest;
}
const elementRect = element.current.getBoundingClientRect();
const distance = elementRect.y - center;
const minDistance = Math.min(
Math.abs(distance),
Math.abs(distance + elementRect.height)
);

if (!closest || closest[1] > minDistance) {
return [element.current, minDistance];
}
return closest;
}, null);
if (closest) {
closest[0].scrollIntoView();
}
}
} catch (e) {
// eslint-disable-next-line no-console
console.error('Unable to scroll node into view:', e.message);
}

}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Autofocus by hackal · Pull Request #9 · CallstackAI/astexplorer · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/workflows/callstack-reviewer.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
name: Callstack.ai PR Review

on:
workflow_dispatch:
inputs:
config:
type: string
description: "config for reviewer"
required: true
head:
type: string
description: "head commit sha"
required: true
base:
type: string
description: "base commit sha"
required: false

jobs:
callstack_pr_review_job:
runs-on: ubuntu-latest
steps:
- name: Review PR
uses: callstackai/action@v1.0.7
with:
config: ${{ inputs.config }}
head: ${{ inputs.head }}
openai_key: ${{ secrets.OPENAI_KEY_2 }}
export: /code/chats.json
channel: pre-release
tag: develop
31 changes: 31 additions & 0 deletions .github/workflows/callstack-reviewer.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
name: Callstack.ai PR Review

on:
workflow_dispatch:
inputs:
config:
type: string
description: "config for reviewer"
required: true
head:
type: string
description: "head commit sha"
required: true
base:
type: string
description: "base commit sha"
required: false

jobs:
callstack_pr_review_job:
runs-on: ubuntu-latest
steps:
- name: Review PR
uses: callstackai/action@v1.0.7
with:
config: ${{ inputs.config }}
head: ${{ inputs.head }}
openai_key: ${{ secrets.OPENAI_KEY_2 }}
export: /code/chats.json
channel: pre-release
tag: develop
2 changes: 1 addition & 1 deletion website/css/style.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -347,7 +347,7 @@ li.entry {
}

.CodeMirror .marked,
.entry.focused {
.entry.highlighted {
border-radius: 2px;
background-color: rgba(255,240,6,0.4);
}
Expand Down
20 changes: 5 additions & 15 deletions website/src/components/ASTOutput.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,8 @@ import PropTypes from 'prop-types';
import React from 'react';
import cx from 'classnames';
import visualizations from './visualization';
import getFocusPath from './getFocusPath';

const {useState, useMemo} = React;
const {useState} = React;

function formatTime(time) {
if (!time) {
Expand All@@ -16,17 +15,9 @@ function formatTime(time) {
return `${(time / 1000).toFixed(2)}s`;
}

export default function ASTOutput({parser, parseResult={}, cursor=null}) {
export default function ASTOutput({parseResult={}, position=null}) {
const [selectedOutput, setSelectedOutput] = useState(0);
const {ast=null} = parseResult;

const focusPath = useMemo(
() => ast && cursor != null ?
getFocusPath(parseResult.ast, cursor, parser) :
[],
[ast, cursor, parser],
);

let output;

if (parseResult.error) {
Expand All@@ -40,7 +31,7 @@ export default function ASTOutput({parser, parseResult={}, cursor=null}) {
{
React.createElement(
visualizations[selectedOutput],
{parseResult, focusPath}
{parseResult, position}
)
}
</ErrorBoundary>
Expand DownExpand Up@@ -68,15 +59,14 @@ export default function ASTOutput({parser, parseResult={}, cursor=null}) {
{formatTime(parseResult.time)}
</span>
</div>
{output}
{output}
</div>
);
}

ASTOutput.propTypes = {
parser: PropTypes.object.isRequired,
parseResult: PropTypes.object,
cursor: PropTypes.any,
position: PropTypes.number,
};

class ErrorBoundary extends React.Component {
Expand Down
45 changes: 0 additions & 45 deletions website/src/components/getFocusPath.js

This file was deleted.

32 changes: 32 additions & 0 deletions website/src/components/visualization/SelectedNodeContext.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
import React from 'react';

const SelectedNodeContext = React.createContext();

function useSelectedNode() {
const context = React.useContext(SelectedNodeContext);
if (!context) {
throw new Error('useSelectedNode must be used within a SelectedNodeContext');
}
return context;
}

let unselectCallback;

function setSelectedNode(node, cb) {
if (unselectCallback) {
unselectCallback();
}
if (node) {
global.$node = node;
unselectCallback = cb;
} else {
unselectCallback = null;
delete global.$node;
}
}

function SelectedNodeProvider(props) {
return <SelectedNodeContext.Provider value={setSelectedNode} {...props} />;
}

export {SelectedNodeProvider, useSelectedNode};
33 changes: 21 additions & 12 deletions website/src/components/visualization/Tree.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,12 @@ import React from 'react';
import PubSub from 'pubsub-js';
import {logEvent} from '../../utils/logger';
import {treeAdapterFromParseResult} from '../../core/TreeAdapter.js';
import {SelectedNodeProvider} from './SelectedNodeContext.js';
import focusNodes from './focusNodes.js'

import './css/tree.css'

const {useReducer, useMemo} = React;
const {useReducer, useMemo, useRef, useLayoutEffect} = React;

const STORAGE_KEY = 'tree_settings';

Expand DownExpand Up@@ -48,12 +50,18 @@ function makeCheckbox(name, settings, updateSettings) {
);
}

export default function Tree({focusPath, parseResult}) {
export default function Tree({parseResult, position}) {
const [settings, updateSettings] = useReducer(reducer, null, initSettings);
const treeAdapter = useMemo(
() => treeAdapterFromParseResult(parseResult, settings),
[parseResult.treeAdapter, settings],
);
const rootElement = useRef();

focusNodes('init');
useLayoutEffect(() => {
focusNodes('focus', rootElement);
});

return (
<div className="tree-visualization container">
Expand All@@ -73,21 +81,22 @@ export default function Tree({focusPath, parseResult}) {
</span>
))}
</div>
<ul onMouseLeave={() => {PubSub.publish('CLEAR_HIGHLIGHT');}}>
<Element
focusPath={focusPath}
value={parseResult.ast}
level={0}
treeAdapter={treeAdapter}
settings={settings}
/>
<ul ref={rootElement} onMouseLeave={() => {PubSub.publish('CLEAR_HIGHLIGHT');}}>
<SelectedNodeProvider>
<Element
value={parseResult.ast}
level={0}
treeAdapter={treeAdapter}
autofocus={settings.autofocus}
position={position}
/>
</SelectedNodeProvider>
</ul>
</div>
);
}

Tree.propTypes = {
focusPath: PropTypes.array,
parseResult: PropTypes.object,
parser: PropTypes.object,
position: PropTypes.number,
};
65 changes: 65 additions & 0 deletions website/src/components/visualization/focusNodes.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
/**
* This may be a horrible way to do it, but this function is called from React
* components to "collect" all elements that represent AST nodes that are
* currently "focused", i.e. the position of the caret corresponds with this
* node.
* Since a node can appear multiple times in the parser output, multiple elements
* can be highlighted. The question is: which element should we scroll to?
* My current answer: The one that is closest to the center vertical center of
* the view.
* React components cannot solve this themselves since they don't have knowledge
* over other elements.
* So this function works as follows:
* - At render, the tree root initializes a new set of nodes.
* - Whenever a child node is rendered and "in focus", it adds a ref to the
* list of elements.
* - After render, the tree root triggers the focus logic. The element that is
* closest to the center is scrolled into the view.
*/
let nodes;

export default function(message, arg) {
switch (message) {
case 'init':
nodes = new Set();
break;
case 'add':
nodes.add(arg);
break;
case 'focus': {
const root = arg.current;
const size = nodes.size;
try {
if (size === 1) {
nodes.values().next().value.current.scrollIntoView();
} else if (size > 1) {
const rootRect = root.getBoundingClientRect();
const center = (rootRect.y + rootRect.height) / 2 + rootRect.y;

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🐛 Bug
The calculation of the center on line 37 is incorrect. It adds rootRect.y twice, which will result in an incorrect vertical center. This will lead to inaccurate determination of which element to scroll into view.

Suggested change
constcenter=(rootRect.y+rootRect.height)/2+rootRect.y;
constcenter=(rootRect.y+rootRect.height)/2;

const closest = Array.from(nodes).reduce((closest, element) => {
if (!element.current) {
return closest;
}
const elementRect = element.current.getBoundingClientRect();
const distance = elementRect.y - center;
const minDistance = Math.min(
Math.abs(distance),
Math.abs(distance + elementRect.height)
);

if (!closest || closest[1] > minDistance) {
return [element.current, minDistance];
}
return closest;
}, null);
if (closest) {
closest[0].scrollIntoView();
}
}
} catch (e) {
// eslint-disable-next-line no-console
console.error('Unable to scroll node into view:', e.message);
}

}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Autofocus by hackal · Pull Request #9 · CallstackAI/astexplorer · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/workflows/callstack-reviewer.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
name: Callstack.ai PR Review

on:
workflow_dispatch:
inputs:
config:
type: string
description: "config for reviewer"
required: true
head:
type: string
description: "head commit sha"
required: true
base:
type: string
description: "base commit sha"
required: false

jobs:
callstack_pr_review_job:
runs-on: ubuntu-latest
steps:
- name: Review PR
uses: callstackai/action@v1.0.7
with:
config: ${{ inputs.config }}
head: ${{ inputs.head }}
openai_key: ${{ secrets.OPENAI_KEY_2 }}
export: /code/chats.json
channel: pre-release
tag: develop
31 changes: 31 additions & 0 deletions .github/workflows/callstack-reviewer.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
name: Callstack.ai PR Review

on:
workflow_dispatch:
inputs:
config:
type: string
description: "config for reviewer"
required: true
head:
type: string
description: "head commit sha"
required: true
base:
type: string
description: "base commit sha"
required: false

jobs:
callstack_pr_review_job:
runs-on: ubuntu-latest
steps:
- name: Review PR
uses: callstackai/action@v1.0.7
with:
config: ${{ inputs.config }}
head: ${{ inputs.head }}
openai_key: ${{ secrets.OPENAI_KEY_2 }}
export: /code/chats.json
channel: pre-release
tag: develop
2 changes: 1 addition & 1 deletion website/css/style.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -347,7 +347,7 @@ li.entry {
}

.CodeMirror .marked,
.entry.focused {
.entry.highlighted {
border-radius: 2px;
background-color: rgba(255,240,6,0.4);
}
Expand Down
20 changes: 5 additions & 15 deletions website/src/components/ASTOutput.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,8 @@ import PropTypes from 'prop-types';
import React from 'react';
import cx from 'classnames';
import visualizations from './visualization';
import getFocusPath from './getFocusPath';

const {useState, useMemo} = React;
const {useState} = React;

function formatTime(time) {
if (!time) {
Expand All@@ -16,17 +15,9 @@ function formatTime(time) {
return `${(time / 1000).toFixed(2)}s`;
}

export default function ASTOutput({parser, parseResult={}, cursor=null}) {
export default function ASTOutput({parseResult={}, position=null}) {
const [selectedOutput, setSelectedOutput] = useState(0);
const {ast=null} = parseResult;

const focusPath = useMemo(
() => ast && cursor != null ?
getFocusPath(parseResult.ast, cursor, parser) :
[],
[ast, cursor, parser],
);

let output;

if (parseResult.error) {
Expand All@@ -40,7 +31,7 @@ export default function ASTOutput({parser, parseResult={}, cursor=null}) {
{
React.createElement(
visualizations[selectedOutput],
{parseResult, focusPath}
{parseResult, position}
)
}
</ErrorBoundary>
Expand DownExpand Up@@ -68,15 +59,14 @@ export default function ASTOutput({parser, parseResult={}, cursor=null}) {
{formatTime(parseResult.time)}
</span>
</div>
{output}
{output}
</div>
);
}

ASTOutput.propTypes = {
parser: PropTypes.object.isRequired,
parseResult: PropTypes.object,
cursor: PropTypes.any,
position: PropTypes.number,
};

class ErrorBoundary extends React.Component {
Expand Down
45 changes: 0 additions & 45 deletions website/src/components/getFocusPath.js

This file was deleted.

32 changes: 32 additions & 0 deletions website/src/components/visualization/SelectedNodeContext.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
import React from 'react';

const SelectedNodeContext = React.createContext();

function useSelectedNode() {
const context = React.useContext(SelectedNodeContext);
if (!context) {
throw new Error('useSelectedNode must be used within a SelectedNodeContext');
}
return context;
}

let unselectCallback;

function setSelectedNode(node, cb) {
if (unselectCallback) {
unselectCallback();
}
if (node) {
global.$node = node;
unselectCallback = cb;
} else {
unselectCallback = null;
delete global.$node;
}
}

function SelectedNodeProvider(props) {
return <SelectedNodeContext.Provider value={setSelectedNode} {...props} />;
}

export {SelectedNodeProvider, useSelectedNode};
33 changes: 21 additions & 12 deletions website/src/components/visualization/Tree.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,12 @@ import React from 'react';
import PubSub from 'pubsub-js';
import {logEvent} from '../../utils/logger';
import {treeAdapterFromParseResult} from '../../core/TreeAdapter.js';
import {SelectedNodeProvider} from './SelectedNodeContext.js';
import focusNodes from './focusNodes.js'

import './css/tree.css'

const {useReducer, useMemo} = React;
const {useReducer, useMemo, useRef, useLayoutEffect} = React;

const STORAGE_KEY = 'tree_settings';

Expand DownExpand Up@@ -48,12 +50,18 @@ function makeCheckbox(name, settings, updateSettings) {
);
}

export default function Tree({focusPath, parseResult}) {
export default function Tree({parseResult, position}) {
const [settings, updateSettings] = useReducer(reducer, null, initSettings);
const treeAdapter = useMemo(
() => treeAdapterFromParseResult(parseResult, settings),
[parseResult.treeAdapter, settings],
);
const rootElement = useRef();

focusNodes('init');
useLayoutEffect(() => {
focusNodes('focus', rootElement);
});

return (
<div className="tree-visualization container">
Expand All@@ -73,21 +81,22 @@ export default function Tree({focusPath, parseResult}) {
</span>
))}
</div>
<ul onMouseLeave={() => {PubSub.publish('CLEAR_HIGHLIGHT');}}>
<Element
focusPath={focusPath}
value={parseResult.ast}
level={0}
treeAdapter={treeAdapter}
settings={settings}
/>
<ul ref={rootElement} onMouseLeave={() => {PubSub.publish('CLEAR_HIGHLIGHT');}}>
<SelectedNodeProvider>
<Element
value={parseResult.ast}
level={0}
treeAdapter={treeAdapter}
autofocus={settings.autofocus}
position={position}
/>
</SelectedNodeProvider>
</ul>
</div>
);
}

Tree.propTypes = {
focusPath: PropTypes.array,
parseResult: PropTypes.object,
parser: PropTypes.object,
position: PropTypes.number,
};
65 changes: 65 additions & 0 deletions website/src/components/visualization/focusNodes.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
/**
* This may be a horrible way to do it, but this function is called from React
* components to "collect" all elements that represent AST nodes that are
* currently "focused", i.e. the position of the caret corresponds with this
* node.
* Since a node can appear multiple times in the parser output, multiple elements
* can be highlighted. The question is: which element should we scroll to?
* My current answer: The one that is closest to the center vertical center of
* the view.
* React components cannot solve this themselves since they don't have knowledge
* over other elements.
* So this function works as follows:
* - At render, the tree root initializes a new set of nodes.
* - Whenever a child node is rendered and "in focus", it adds a ref to the
* list of elements.
* - After render, the tree root triggers the focus logic. The element that is
* closest to the center is scrolled into the view.
*/
let nodes;

export default function(message, arg) {
switch (message) {
case 'init':
nodes = new Set();
break;
case 'add':
nodes.add(arg);
break;
case 'focus': {
const root = arg.current;
const size = nodes.size;
try {
if (size === 1) {
nodes.values().next().value.current.scrollIntoView();
} else if (size > 1) {
const rootRect = root.getBoundingClientRect();
const center = (rootRect.y + rootRect.height) / 2 + rootRect.y;

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🐛 Bug
The calculation of the center on line 37 is incorrect. It adds rootRect.y twice, which will result in an incorrect vertical center. This will lead to inaccurate determination of which element to scroll into view.

Suggested change
constcenter=(rootRect.y+rootRect.height)/2+rootRect.y;
constcenter=(rootRect.y+rootRect.height)/2;

const closest = Array.from(nodes).reduce((closest, element) => {
if (!element.current) {
return closest;
}
const elementRect = element.current.getBoundingClientRect();
const distance = elementRect.y - center;
const minDistance = Math.min(
Math.abs(distance),
Math.abs(distance + elementRect.height)
);

if (!closest || closest[1] > minDistance) {
return [element.current, minDistance];
}
return closest;
}, null);
if (closest) {
closest[0].scrollIntoView();
}
}
} catch (e) {
// eslint-disable-next-line no-console
console.error('Unable to scroll node into view:', e.message);
}

}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Autofocus by hackal · Pull Request #9 · CallstackAI/astexplorer · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/workflows/callstack-reviewer.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
name: Callstack.ai PR Review

on:
workflow_dispatch:
inputs:
config:
type: string
description: "config for reviewer"
required: true
head:
type: string
description: "head commit sha"
required: true
base:
type: string
description: "base commit sha"
required: false

jobs:
callstack_pr_review_job:
runs-on: ubuntu-latest
steps:
- name: Review PR
uses: callstackai/action@v1.0.7
with:
config: ${{ inputs.config }}
head: ${{ inputs.head }}
openai_key: ${{ secrets.OPENAI_KEY_2 }}
export: /code/chats.json
channel: pre-release
tag: develop
31 changes: 31 additions & 0 deletions .github/workflows/callstack-reviewer.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
name: Callstack.ai PR Review

on:
workflow_dispatch:
inputs:
config:
type: string
description: "config for reviewer"
required: true
head:
type: string
description: "head commit sha"
required: true
base:
type: string
description: "base commit sha"
required: false

jobs:
callstack_pr_review_job:
runs-on: ubuntu-latest
steps:
- name: Review PR
uses: callstackai/action@v1.0.7
with:
config: ${{ inputs.config }}
head: ${{ inputs.head }}
openai_key: ${{ secrets.OPENAI_KEY_2 }}
export: /code/chats.json
channel: pre-release
tag: develop
2 changes: 1 addition & 1 deletion website/css/style.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -347,7 +347,7 @@ li.entry {
}

.CodeMirror .marked,
.entry.focused {
.entry.highlighted {
border-radius: 2px;
background-color: rgba(255,240,6,0.4);
}
Expand Down
20 changes: 5 additions & 15 deletions website/src/components/ASTOutput.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,8 @@ import PropTypes from 'prop-types';
import React from 'react';
import cx from 'classnames';
import visualizations from './visualization';
import getFocusPath from './getFocusPath';

const {useState, useMemo} = React;
const {useState} = React;

function formatTime(time) {
if (!time) {
Expand All@@ -16,17 +15,9 @@ function formatTime(time) {
return `${(time / 1000).toFixed(2)}s`;
}

export default function ASTOutput({parser, parseResult={}, cursor=null}) {
export default function ASTOutput({parseResult={}, position=null}) {
const [selectedOutput, setSelectedOutput] = useState(0);
const {ast=null} = parseResult;

const focusPath = useMemo(
() => ast && cursor != null ?
getFocusPath(parseResult.ast, cursor, parser) :
[],
[ast, cursor, parser],
);

let output;

if (parseResult.error) {
Expand All@@ -40,7 +31,7 @@ export default function ASTOutput({parser, parseResult={}, cursor=null}) {
{
React.createElement(
visualizations[selectedOutput],
{parseResult, focusPath}
{parseResult, position}
)
}
</ErrorBoundary>
Expand DownExpand Up@@ -68,15 +59,14 @@ export default function ASTOutput({parser, parseResult={}, cursor=null}) {
{formatTime(parseResult.time)}
</span>
</div>
{output}
{output}
</div>
);
}

ASTOutput.propTypes = {
parser: PropTypes.object.isRequired,
parseResult: PropTypes.object,
cursor: PropTypes.any,
position: PropTypes.number,
};

class ErrorBoundary extends React.Component {
Expand Down
45 changes: 0 additions & 45 deletions website/src/components/getFocusPath.js

This file was deleted.

32 changes: 32 additions & 0 deletions website/src/components/visualization/SelectedNodeContext.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
import React from 'react';

const SelectedNodeContext = React.createContext();

function useSelectedNode() {
const context = React.useContext(SelectedNodeContext);
if (!context) {
throw new Error('useSelectedNode must be used within a SelectedNodeContext');
}
return context;
}

let unselectCallback;

function setSelectedNode(node, cb) {
if (unselectCallback) {
unselectCallback();
}
if (node) {
global.$node = node;
unselectCallback = cb;
} else {
unselectCallback = null;
delete global.$node;
}
}

function SelectedNodeProvider(props) {
return <SelectedNodeContext.Provider value={setSelectedNode} {...props} />;
}

export {SelectedNodeProvider, useSelectedNode};
33 changes: 21 additions & 12 deletions website/src/components/visualization/Tree.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,12 @@ import React from 'react';
import PubSub from 'pubsub-js';
import {logEvent} from '../../utils/logger';
import {treeAdapterFromParseResult} from '../../core/TreeAdapter.js';
import {SelectedNodeProvider} from './SelectedNodeContext.js';
import focusNodes from './focusNodes.js'

import './css/tree.css'

const {useReducer, useMemo} = React;
const {useReducer, useMemo, useRef, useLayoutEffect} = React;

const STORAGE_KEY = 'tree_settings';

Expand DownExpand Up@@ -48,12 +50,18 @@ function makeCheckbox(name, settings, updateSettings) {
);
}

export default function Tree({focusPath, parseResult}) {
export default function Tree({parseResult, position}) {
const [settings, updateSettings] = useReducer(reducer, null, initSettings);
const treeAdapter = useMemo(
() => treeAdapterFromParseResult(parseResult, settings),
[parseResult.treeAdapter, settings],
);
const rootElement = useRef();

focusNodes('init');
useLayoutEffect(() => {
focusNodes('focus', rootElement);
});

return (
<div className="tree-visualization container">
Expand All@@ -73,21 +81,22 @@ export default function Tree({focusPath, parseResult}) {
</span>
))}
</div>
<ul onMouseLeave={() => {PubSub.publish('CLEAR_HIGHLIGHT');}}>
<Element
focusPath={focusPath}
value={parseResult.ast}
level={0}
treeAdapter={treeAdapter}
settings={settings}
/>
<ul ref={rootElement} onMouseLeave={() => {PubSub.publish('CLEAR_HIGHLIGHT');}}>
<SelectedNodeProvider>
<Element
value={parseResult.ast}
level={0}
treeAdapter={treeAdapter}
autofocus={settings.autofocus}
position={position}
/>
</SelectedNodeProvider>
</ul>
</div>
);
}

Tree.propTypes = {
focusPath: PropTypes.array,
parseResult: PropTypes.object,
parser: PropTypes.object,
position: PropTypes.number,
};
65 changes: 65 additions & 0 deletions website/src/components/visualization/focusNodes.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
/**
* This may be a horrible way to do it, but this function is called from React
* components to "collect" all elements that represent AST nodes that are
* currently "focused", i.e. the position of the caret corresponds with this
* node.
* Since a node can appear multiple times in the parser output, multiple elements
* can be highlighted. The question is: which element should we scroll to?
* My current answer: The one that is closest to the center vertical center of
* the view.
* React components cannot solve this themselves since they don't have knowledge
* over other elements.
* So this function works as follows:
* - At render, the tree root initializes a new set of nodes.
* - Whenever a child node is rendered and "in focus", it adds a ref to the
* list of elements.
* - After render, the tree root triggers the focus logic. The element that is
* closest to the center is scrolled into the view.
*/
let nodes;

export default function(message, arg) {
switch (message) {
case 'init':
nodes = new Set();
break;
case 'add':
nodes.add(arg);
break;
case 'focus': {
const root = arg.current;
const size = nodes.size;
try {
if (size === 1) {
nodes.values().next().value.current.scrollIntoView();
} else if (size > 1) {
const rootRect = root.getBoundingClientRect();
const center = (rootRect.y + rootRect.height) / 2 + rootRect.y;

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🐛 Bug
The calculation of the center on line 37 is incorrect. It adds rootRect.y twice, which will result in an incorrect vertical center. This will lead to inaccurate determination of which element to scroll into view.

Suggested change
constcenter=(rootRect.y+rootRect.height)/2+rootRect.y;
constcenter=(rootRect.y+rootRect.height)/2;

const closest = Array.from(nodes).reduce((closest, element) => {
if (!element.current) {
return closest;
}
const elementRect = element.current.getBoundingClientRect();
const distance = elementRect.y - center;
const minDistance = Math.min(
Math.abs(distance),
Math.abs(distance + elementRect.height)
);

if (!closest || closest[1] > minDistance) {
return [element.current, minDistance];
}
return closest;
}, null);
if (closest) {
closest[0].scrollIntoView();
}
}
} catch (e) {
// eslint-disable-next-line no-console
console.error('Unable to scroll node into view:', e.message);
}

}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Autofocus by hackal · Pull Request #9 · CallstackAI/astexplorer · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/workflows/callstack-reviewer.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
name: Callstack.ai PR Review

on:
workflow_dispatch:
inputs:
config:
type: string
description: "config for reviewer"
required: true
head:
type: string
description: "head commit sha"
required: true
base:
type: string
description: "base commit sha"
required: false

jobs:
callstack_pr_review_job:
runs-on: ubuntu-latest
steps:
- name: Review PR
uses: callstackai/action@v1.0.7
with:
config: ${{ inputs.config }}
head: ${{ inputs.head }}
openai_key: ${{ secrets.OPENAI_KEY_2 }}
export: /code/chats.json
channel: pre-release
tag: develop
31 changes: 31 additions & 0 deletions .github/workflows/callstack-reviewer.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
name: Callstack.ai PR Review

on:
workflow_dispatch:
inputs:
config:
type: string
description: "config for reviewer"
required: true
head:
type: string
description: "head commit sha"
required: true
base:
type: string
description: "base commit sha"
required: false

jobs:
callstack_pr_review_job:
runs-on: ubuntu-latest
steps:
- name: Review PR
uses: callstackai/action@v1.0.7
with:
config: ${{ inputs.config }}
head: ${{ inputs.head }}
openai_key: ${{ secrets.OPENAI_KEY_2 }}
export: /code/chats.json
channel: pre-release
tag: develop
2 changes: 1 addition & 1 deletion website/css/style.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -347,7 +347,7 @@ li.entry {
}

.CodeMirror .marked,
.entry.focused {
.entry.highlighted {
border-radius: 2px;
background-color: rgba(255,240,6,0.4);
}
Expand Down
20 changes: 5 additions & 15 deletions website/src/components/ASTOutput.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,8 @@ import PropTypes from 'prop-types';
import React from 'react';
import cx from 'classnames';
import visualizations from './visualization';
import getFocusPath from './getFocusPath';

const {useState, useMemo} = React;
const {useState} = React;

function formatTime(time) {
if (!time) {
Expand All@@ -16,17 +15,9 @@ function formatTime(time) {
return `${(time / 1000).toFixed(2)}s`;
}

export default function ASTOutput({parser, parseResult={}, cursor=null}) {
export default function ASTOutput({parseResult={}, position=null}) {
const [selectedOutput, setSelectedOutput] = useState(0);
const {ast=null} = parseResult;

const focusPath = useMemo(
() => ast && cursor != null ?
getFocusPath(parseResult.ast, cursor, parser) :
[],
[ast, cursor, parser],
);

let output;

if (parseResult.error) {
Expand All@@ -40,7 +31,7 @@ export default function ASTOutput({parser, parseResult={}, cursor=null}) {
{
React.createElement(
visualizations[selectedOutput],
{parseResult, focusPath}
{parseResult, position}
)
}
</ErrorBoundary>
Expand DownExpand Up@@ -68,15 +59,14 @@ export default function ASTOutput({parser, parseResult={}, cursor=null}) {
{formatTime(parseResult.time)}
</span>
</div>
{output}
{output}
</div>
);
}

ASTOutput.propTypes = {
parser: PropTypes.object.isRequired,
parseResult: PropTypes.object,
cursor: PropTypes.any,
position: PropTypes.number,
};

class ErrorBoundary extends React.Component {
Expand Down
45 changes: 0 additions & 45 deletions website/src/components/getFocusPath.js

This file was deleted.

32 changes: 32 additions & 0 deletions website/src/components/visualization/SelectedNodeContext.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
import React from 'react';

const SelectedNodeContext = React.createContext();

function useSelectedNode() {
const context = React.useContext(SelectedNodeContext);
if (!context) {
throw new Error('useSelectedNode must be used within a SelectedNodeContext');
}
return context;
}

let unselectCallback;

function setSelectedNode(node, cb) {
if (unselectCallback) {
unselectCallback();
}
if (node) {
global.$node = node;
unselectCallback = cb;
} else {
unselectCallback = null;
delete global.$node;
}
}

function SelectedNodeProvider(props) {
return <SelectedNodeContext.Provider value={setSelectedNode} {...props} />;
}

export {SelectedNodeProvider, useSelectedNode};
33 changes: 21 additions & 12 deletions website/src/components/visualization/Tree.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,12 @@ import React from 'react';
import PubSub from 'pubsub-js';
import {logEvent} from '../../utils/logger';
import {treeAdapterFromParseResult} from '../../core/TreeAdapter.js';
import {SelectedNodeProvider} from './SelectedNodeContext.js';
import focusNodes from './focusNodes.js'

import './css/tree.css'

const {useReducer, useMemo} = React;
const {useReducer, useMemo, useRef, useLayoutEffect} = React;

const STORAGE_KEY = 'tree_settings';

Expand DownExpand Up@@ -48,12 +50,18 @@ function makeCheckbox(name, settings, updateSettings) {
);
}

export default function Tree({focusPath, parseResult}) {
export default function Tree({parseResult, position}) {
const [settings, updateSettings] = useReducer(reducer, null, initSettings);
const treeAdapter = useMemo(
() => treeAdapterFromParseResult(parseResult, settings),
[parseResult.treeAdapter, settings],
);
const rootElement = useRef();

focusNodes('init');
useLayoutEffect(() => {
focusNodes('focus', rootElement);
});

return (
<div className="tree-visualization container">
Expand All@@ -73,21 +81,22 @@ export default function Tree({focusPath, parseResult}) {
</span>
))}
</div>
<ul onMouseLeave={() => {PubSub.publish('CLEAR_HIGHLIGHT');}}>
<Element
focusPath={focusPath}
value={parseResult.ast}
level={0}
treeAdapter={treeAdapter}
settings={settings}
/>
<ul ref={rootElement} onMouseLeave={() => {PubSub.publish('CLEAR_HIGHLIGHT');}}>
<SelectedNodeProvider>
<Element
value={parseResult.ast}
level={0}
treeAdapter={treeAdapter}
autofocus={settings.autofocus}
position={position}
/>
</SelectedNodeProvider>
</ul>
</div>
);
}

Tree.propTypes = {
focusPath: PropTypes.array,
parseResult: PropTypes.object,
parser: PropTypes.object,
position: PropTypes.number,
};
65 changes: 65 additions & 0 deletions website/src/components/visualization/focusNodes.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
/**
* This may be a horrible way to do it, but this function is called from React
* components to "collect" all elements that represent AST nodes that are
* currently "focused", i.e. the position of the caret corresponds with this
* node.
* Since a node can appear multiple times in the parser output, multiple elements
* can be highlighted. The question is: which element should we scroll to?
* My current answer: The one that is closest to the center vertical center of
* the view.
* React components cannot solve this themselves since they don't have knowledge
* over other elements.
* So this function works as follows:
* - At render, the tree root initializes a new set of nodes.
* - Whenever a child node is rendered and "in focus", it adds a ref to the
* list of elements.
* - After render, the tree root triggers the focus logic. The element that is
* closest to the center is scrolled into the view.
*/
let nodes;

export default function(message, arg) {
switch (message) {
case 'init':
nodes = new Set();
break;
case 'add':
nodes.add(arg);
break;
case 'focus': {
const root = arg.current;
const size = nodes.size;
try {
if (size === 1) {
nodes.values().next().value.current.scrollIntoView();
} else if (size > 1) {
const rootRect = root.getBoundingClientRect();
const center = (rootRect.y + rootRect.height) / 2 + rootRect.y;

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🐛 Bug
The calculation of the center on line 37 is incorrect. It adds rootRect.y twice, which will result in an incorrect vertical center. This will lead to inaccurate determination of which element to scroll into view.

Suggested change
constcenter=(rootRect.y+rootRect.height)/2+rootRect.y;
constcenter=(rootRect.y+rootRect.height)/2;

const closest = Array.from(nodes).reduce((closest, element) => {
if (!element.current) {
return closest;
}
const elementRect = element.current.getBoundingClientRect();
const distance = elementRect.y - center;
const minDistance = Math.min(
Math.abs(distance),
Math.abs(distance + elementRect.height)
);

if (!closest || closest[1] > minDistance) {
return [element.current, minDistance];
}
return closest;
}, null);
if (closest) {
closest[0].scrollIntoView();
}
}
} catch (e) {
// eslint-disable-next-line no-console
console.error('Unable to scroll node into view:', e.message);
}

}
}
}
Loading