Skip to content

Fixes initialization of UASTViewer #413

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
merged 1 commit into from
Apr 19, 2019
Merged

Fixes initialization of UASTViewer #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

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: 3 additions & 3 deletions frontend/src/components/UASTViewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class UASTViewer extends Component {

this.state = {
loading: false,
flatUast: this.transform(props.uast),
initialFlatUast: this.transform(props.uast),
showLocations: false,
filter: '',
error: null
Expand Down Expand Up @@ -65,9 +65,9 @@ class UASTViewer extends Component {
}

render() {
const { flatUast, error, loading } = this.state;
const { initialFlatUast, error, loading } = this.state;
const { showLocations, filter } = this.state;
const uastViewerProps = { flatUast };
const uastViewerProps = { initialFlatUast };

return (
<div className="pg-uast-viewer">
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/UASTViewerPane.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ function UASTViewerPane({
}) {
let content = null;

const uast = uastViewerProps.flatUast || uastViewerProps.initialFlatUast;
if (loading) {
content = <div>loading...</div>;
} else if (uastViewerProps.flatUast) {
const searchResults = getSearchResults(uastViewerProps.flatUast);
} else if (uast) {
const searchResults = getSearchResults(uast);
const rootIds = searchResults || [ROOT_ID];

if (searchResults && !searchResults.length) {
Expand Down