Merge pull request #810 from onflow/staging

updated language server
onflow · Sep 19, 2024 · cd8a5e3 · cd8a5e3
2 parents 107979e + 5e2bf80
commit cd8a5e3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git 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.
 

diff --git a/package-lock.json b/package-lock.json
diff --git 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",

diff --git 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<ThemedComponentProps>`
   }
   &.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
@@ -18,6 +18,7 @@ export default {
     errors: '#FC4723',
     errorBackground: '#ee431e',
     warning: '#ffcc00',
+    warningText: '#2f353f',
     info: '#55EE1E26',
     infoBackground: '#55EE1E',
     error: '#f44336',