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.

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

Major LSP refactoring #238

Merged
merged 49 commits into from
Apr 14, 2022
Merged
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
e290f3e
Add hooks for language server
MaxStalker Mar 18, 2022
1ab08d4
Editor layout components
MaxStalker Mar 18, 2022
fd1f7ee
Move portions out of editor components
MaxStalker Mar 18, 2022
cc2f314
Disable some of the Typescript features to speed up development
MaxStalker Mar 18, 2022
6275f43
Isolate monaco editor and language server/client
MaxStalker Mar 21, 2022
eadcecd
Update language server hook
MaxStalker Mar 24, 2022
355e80e
Create CadenceChecker context provider
MaxStalker Mar 24, 2022
a1a9bae
Add cadence checker to context
MaxStalker Mar 24, 2022
bc2cd33
Remove getCode dependency
MaxStalker Mar 24, 2022
adfb096
Use ref for monaco editor to prevent destroying it
MaxStalker Mar 24, 2022
46b7a2a
Debug failing code
MaxStalker Mar 24, 2022
b3d41e1
More debug
MaxStalker Mar 24, 2022
6c34350
Debug errors
MaxStalker Mar 28, 2022
6033528
Trying to find update bug
MaxStalker Mar 29, 2022
d0ffe47
Update packages
MaxStalker Mar 30, 2022
1e73049
Update imports
MaxStalker Mar 30, 2022
356d264
Show language client and server status in the top bar
MaxStalker Mar 30, 2022
62b125a
Sorta stable version
MaxStalker Mar 30, 2022
6af647a
Working code refresh
MaxStalker Mar 30, 2022
aaab900
Fix how changes are saved. Remove console logs
MaxStalker Apr 1, 2022
b0c6fb1
Remove mobile boundaries
MaxStalker Apr 4, 2022
e414e17
Clean up language server
MaxStalker Apr 4, 2022
0e4ad7b
Refactor components. Create new ControlPanel component for Arguments
MaxStalker Apr 4, 2022
e0d59cc
More ControlPanel refactoring
MaxStalker Apr 5, 2022
2063e29
Working layout for control Panel. Assembly process
MaxStalker Apr 5, 2022
e39ca74
Fix yield error
MaxStalker Apr 5, 2022
c35b929
More refactoring around error messages
MaxStalker Apr 6, 2022
c70335a
Move hover in
MaxStalker Apr 7, 2022
7950991
Use deployedCode for code checks
MaxStalker Apr 7, 2022
f6e9a6e
Refactor actions props
MaxStalker Apr 7, 2022
869ece1
Define editor type. Clear unnecessary props
MaxStalker Apr 7, 2022
6c2a700
Use deployedCode
MaxStalker Apr 7, 2022
c20fb0f
Refactor methods, hooks and components. Sprinkle with documentation f…
MaxStalker Apr 7, 2022
d3b883c
Revert back to draftCode as it should be
MaxStalker Apr 7, 2022
c2d049a
Move EditorState into types file
MaxStalker Apr 8, 2022
8985d69
Create Notifications component
MaxStalker Apr 8, 2022
f928e2f
Clean up Notifications bits from ControlPanel
MaxStalker Apr 8, 2022
4eefa06
Update CadenceEditor
MaxStalker Apr 8, 2022
c31d186
Clean up
MaxStalker Apr 8, 2022
9114d6b
Clear decorations, when errors are fixed
MaxStalker Apr 8, 2022
80331ad
Memoize list of arguments
MaxStalker Apr 8, 2022
28b4474
Speed up refresh for debounce model change
MaxStalker Apr 8, 2022
ab1c6c5
Pass key proper way
MaxStalker Apr 8, 2022
51b2ed5
Refactor LSP status
MaxStalker Apr 12, 2022
7dd9de7
Update argument extraction
MaxStalker Apr 12, 2022
5a7bbf9
Fixed editor change catchup
MaxStalker Apr 12, 2022
26e134e
Add Hidable component to prevent resetting of argument values
MaxStalker Apr 12, 2022
0e589a5
Adjust update value
MaxStalker Apr 12, 2022
8418c8a
Restore tsconfig
MaxStalker Apr 12, 2022
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
14 changes: 7 additions & 7 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// babel.config.js
module.exports = {
presets: [
['@babel/preset-env', {targets: {node: 'current'}}],
'@babel/preset-typescript'
]
};
// babel.config.js
module.exports = {
presets: [
['@babel/preset-env', { targets: { node: 'current' } }],
'@babel/preset-typescript',
],
};
117 changes: 56 additions & 61 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"jszip": "^3.5.0",
"markdown-to-jsx": "^7.1.3",
"mixpanel-browser": "^2.39.0",
"monaco-editor": "^0.22.3",
"monaco-languageclient": "^0.13.1-next.9",
"monaco-editor": "^0.33.0",
"monaco-languageclient": "^0.18.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-ga": "^3.1.2",
Expand Down Expand Up @@ -77,7 +77,7 @@
"handlebars": "^4.7.6",
"html-webpack-plugin": "^4.4.1",
"jest": "^26.6.3",
"monaco-editor-webpack-plugin": "^3.0.0",
"monaco-editor-webpack-plugin": "^7.0.1",
"prettier": "^2.2.1",
"style-loader": "^1.2.1",
"ts-loader": "^8.0.3",
Expand Down
38 changes: 13 additions & 25 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,38 +1,27 @@
import React, { useEffect } from 'react';
import { Global } from '@emotion/core';
import { ThemeProvider, Text } from 'theme-ui';
import { ThemeProvider } from 'theme-ui';
import { Router, globalHistory } from '@reach/router';
import { ApolloProvider } from '@apollo/react-hooks';
import AppMobileWrapper from 'containers/AppMobileWrapper';
import BrowserDetector from 'components/BrowserDetector';
import 'reset-css';

import * as GoogleAnalytics from 'util/google-analytics';
import client from 'api/apollo/client';
import globalStyles from './globalStyles';
import theme from './theme';
import 'reset-css';

import Playground from 'containers/Editor';
import AppMobileWrapper from 'containers/AppMobileWrapper';
import BrowserDetector from 'components/BrowserDetector';

import FourOhFour from './pages/404';
import globalStyles from './globalStyles';
import theme from './theme';

GoogleAnalytics.initialize(process.env.GA_TRACKING_CODE);

const Base = (props: any) => {
return <div>{props.children}</div>;
};

const version = (
<Text
sx={{
color: 'lightgrey',
position: 'absolute',
bottom: '1rem',
right: '1rem',
}}
>
v0.3.5
</Text>
);

const App: React.FC = () => {
useEffect(() => {
// record initial pageview
Expand All @@ -52,13 +41,12 @@ const App: React.FC = () => {
<ThemeProvider theme={theme}>
<AppMobileWrapper>
<Router>
<Base path="/">
<FourOhFour path="404" />
<Playground path="/" />
<Playground path="/:projectId" />
</Base>
<Base path="/">
<FourOhFour path="404" />
<Playground path="/" />
<Playground path="/:projectId" />
</Base>
</Router>
{version}
</AppMobileWrapper>
</ThemeProvider>
</ApolloProvider>
Expand Down
Loading