From d02973b4caf45a7bd666c2a805774888951499f0 Mon Sep 17 00:00:00 2001 From: Alex Ni <12097569+nialexsan@users.noreply.github.com> Date: Thu, 19 Sep 2024 15:45:48 -0400 Subject: [PATCH 1/4] updated language server --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index e02b5ad3..d901e0ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@hotjar/browser": "^1.0.6", "@ibm/plex": "^6.1.1", "@mdx-js/react": "^2.3.0", - "@onflow/cadence-language-server": "1.0.0-preview.35", + "@onflow/cadence-language-server": "1.0.0-preview.39", "@reach/router": "^1.3.4", "@sentry/integrations": "^7.44.0", "@sentry/react": "^7.44.0", @@ -4881,9 +4881,9 @@ } }, "node_modules/@onflow/cadence-language-server": { - "version": "1.0.0-preview.35", - "resolved": "https://registry.npmjs.org/@onflow/cadence-language-server/-/cadence-language-server-1.0.0-preview.35.tgz", - "integrity": "sha512-wx4hRZyaaABVHhIsyk2o5DTB6Sda0GpftFodbQKOm803m1tB4F6cLbpfEv6cHdmBU/pNym+XeZ3me18tpPKdJg==", + "version": "1.0.0-preview.39", + "resolved": "https://registry.npmjs.org/@onflow/cadence-language-server/-/cadence-language-server-1.0.0-preview.39.tgz", + "integrity": "sha512-UERglaCCq+JmQXadFNnKoGvhCJrFdyFFTIPH7AqhmtmDFciLPM/d3AxoTLILdGtGTcQcT/xQWO7bPGM6ih9mMQ==", "dependencies": { "vscode-jsonrpc": "^8.2.0" } @@ -21981,9 +21981,9 @@ } }, "@onflow/cadence-language-server": { - "version": "1.0.0-preview.35", - "resolved": "https://registry.npmjs.org/@onflow/cadence-language-server/-/cadence-language-server-1.0.0-preview.35.tgz", - "integrity": "sha512-wx4hRZyaaABVHhIsyk2o5DTB6Sda0GpftFodbQKOm803m1tB4F6cLbpfEv6cHdmBU/pNym+XeZ3me18tpPKdJg==", + "version": "1.0.0-preview.39", + "resolved": "https://registry.npmjs.org/@onflow/cadence-language-server/-/cadence-language-server-1.0.0-preview.39.tgz", + "integrity": "sha512-UERglaCCq+JmQXadFNnKoGvhCJrFdyFFTIPH7AqhmtmDFciLPM/d3AxoTLILdGtGTcQcT/xQWO7bPGM6ih9mMQ==", "requires": { "vscode-jsonrpc": "^8.2.0" }, diff --git a/package.json b/package.json index 8d352b85..b02143da 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@hotjar/browser": "^1.0.6", "@ibm/plex": "^6.1.1", "@mdx-js/react": "^2.3.0", - "@onflow/cadence-language-server": "1.0.0-preview.35", + "@onflow/cadence-language-server": "1.0.0-preview.39", "@reach/router": "^1.3.4", "@sentry/integrations": "^7.44.0", "@sentry/react": "^7.44.0", From 3e606ff92ea058f07c8bb569a0716d08ee54df09 Mon Sep 17 00:00:00 2001 From: Alex Ni <12097569+nialexsan@users.noreply.github.com> Date: Thu, 19 Sep 2024 16:00:29 -0400 Subject: [PATCH 2/4] add info regarding default branch #757 --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 906ffbe6..19653d70 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -95,6 +95,8 @@ The process described here has several goals: - Engage the community in working toward the best possible Playground UX - Enable a sustainable system for the Playground's maintainers to review contributions +PRs should be created against the `staging` branch, which is currently the default branch of the repo. + Please follow the [styleguides](#styleguides) to have your contribution considered by the maintainers. Reviewer(s) may ask you to complete additional design work, tests, or other changes before your pull request can be ultimately accepted. From b26490abd285b390d344bf60777ef0f05abc3ca2 Mon Sep 17 00:00:00 2001 From: Alex Ni <12097569+nialexsan@users.noreply.github.com> Date: Thu, 19 Sep 2024 16:49:02 -0400 Subject: [PATCH 3/4] warning text color #725 --- .../Editor/CadenceEditor/ControlPanel/Arguments/styles.tsx | 1 + src/theme.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/components/Editor/CadenceEditor/ControlPanel/Arguments/styles.tsx b/src/components/Editor/CadenceEditor/ControlPanel/Arguments/styles.tsx index 94c85da2..9787aae0 100644 --- a/src/components/Editor/CadenceEditor/ControlPanel/Arguments/styles.tsx +++ b/src/components/Editor/CadenceEditor/ControlPanel/Arguments/styles.tsx @@ -195,6 +195,7 @@ export const SingleError = styled.div` } &.hint-warning { background-color: ${({ theme }) => theme.colors.warning}; + color: ${({ theme }) => theme.colors.warningText} } &.hint-info { diff --git a/src/theme.ts b/src/theme.ts index c3bdd7ad..58493aa9 100644 --- a/src/theme.ts +++ b/src/theme.ts @@ -18,6 +18,7 @@ export default { errors: '#FC4723', errorBackground: '#ee431e', warning: '#ffcc00', + warningText: '#2f353f', info: '#55EE1E26', infoBackground: '#55EE1E', error: '#f44336', From 5e2bf80ccae3ffbeb3e8f57d0ce4f4a1aad4a7d4 Mon Sep 17 00:00:00 2001 From: Alex Ni <12097569+nialexsan@users.noreply.github.com> Date: Thu, 19 Sep 2024 17:12:32 -0400 Subject: [PATCH 4/4] format --- .../Editor/CadenceEditor/ControlPanel/Arguments/styles.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Editor/CadenceEditor/ControlPanel/Arguments/styles.tsx b/src/components/Editor/CadenceEditor/ControlPanel/Arguments/styles.tsx index 9787aae0..8518b242 100644 --- a/src/components/Editor/CadenceEditor/ControlPanel/Arguments/styles.tsx +++ b/src/components/Editor/CadenceEditor/ControlPanel/Arguments/styles.tsx @@ -195,7 +195,7 @@ export const SingleError = styled.div` } &.hint-warning { background-color: ${({ theme }) => theme.colors.warning}; - color: ${({ theme }) => theme.colors.warningText} + color: ${({ theme }) => theme.colors.warningText}; } &.hint-info {