@fsegurai/codemirror-theme-android-studio 6.2.0-beta.2 → 6.2.0-beta.4

package/dist/index.cjs

@@ -3,7 +3,7 @@
 var view = require('@codemirror/view');
 var language = require('@codemirror/language');
 var highlight = require('@lezer/highlight');
-var utils = require('../../.helper/utils');
+var codemirrorThemeUtils = require('@fsegurai/codemirror-theme-utils');
 
 /**
  * Enhanced Android Studio theme color palette
@@ -47,17 +47,17 @@ const androidStudioTheme = view.EditorView.theme({
     '&': {
         color: base01,
         backgroundColor: base00,
-        fontSize: utils.generalContent.fontSize,
-        fontFamily: utils.generalContent.fontFamily,
+        fontSize: codemirrorThemeUtils.generalContent.fontSize,
+        fontFamily: codemirrorThemeUtils.generalContent.fontFamily,
     },
     // Content and cursor
     '.cm-content': {
         caretColor: cursor,
-        lineHeight: utils.generalContent.lineHeight,
+        lineHeight: codemirrorThemeUtils.generalContent.lineHeight,
     },
     '.cm-cursor, .cm-dropCursor': {
         borderLeftColor: cursor,
-        borderLeftWidth: utils.generalCursor.borderLeftWidth,
+        borderLeftWidth: codemirrorThemeUtils.generalCursor.borderLeftWidth,
     },
     '.cm-fat-cursor': {
         backgroundColor: `${cursor}99`,
@@ -71,7 +71,7 @@ const androidStudioTheme = view.EditorView.theme({
     '.cm-searchMatch': {
         backgroundColor: '#32593d',
         outline: '1px solid #ffffff',
-        borderRadius: utils.generalSearchField.borderRadius,
+        borderRadius: codemirrorThemeUtils.generalSearchField.borderRadius,
         '& span': {
             color: selectionForeground,
         },
@@ -79,15 +79,15 @@ const androidStudioTheme = view.EditorView.theme({
     '.cm-searchMatch.cm-searchMatch-selected': {
         backgroundColor: '#375580',
         color: selectionForeground,
-        padding: utils.generalSearchField.padding,
+        padding: codemirrorThemeUtils.generalSearchField.padding,
         '& span': {
             color: selectionForeground,
         },
     },
     '.cm-search.cm-panel.cm-textfield': {
         color: base01,
-        borderRadius: utils.generalSearchField.borderRadius,
-        padding: utils.generalSearchField.padding,
+        borderRadius: codemirrorThemeUtils.generalSearchField.borderRadius,
+        padding: codemirrorThemeUtils.generalSearchField.padding,
     },
     // Panels
     '.cm-panels': {
@@ -103,9 +103,9 @@ const androidStudioTheme = view.EditorView.theme({
     '.cm-panel button': {
         backgroundColor: darkBackground,
         color: base01,
-        border: utils.generalPanel.border,
-        borderRadius: utils.generalPanel.borderRadius,
-        padding: utils.generalPanel.padding,
+        border: codemirrorThemeUtils.generalPanel.border,
+        borderRadius: codemirrorThemeUtils.generalPanel.borderRadius,
+        padding: codemirrorThemeUtils.generalPanel.padding,
     },
     '.cm-panel button:hover': {
         backgroundColor: '#404040',
@@ -113,26 +113,26 @@ const androidStudioTheme = view.EditorView.theme({
     // Line highlighting
     '.cm-activeLine': {
         backgroundColor: '#32323221',
-        borderRadius: utils.generalLine.borderRadius,
+        borderRadius: codemirrorThemeUtils.generalLine.borderRadius,
     },
     // Gutters
     '.cm-gutters': {
         backgroundColor: gutterBackground,
         color: base04,
-        border: utils.generalGutter.border,
+        border: codemirrorThemeUtils.generalGutter.border,
         borderRight: '1px solid #3f3f3f',
-        paddingRight: utils.generalGutter.paddingRight,
+        paddingRight: codemirrorThemeUtils.generalGutter.paddingRight,
     },
     '.cm-activeLineGutter': {
         backgroundColor: highlightBackground,
         color: '#c0c0c0',
-        fontWeight: utils.generalGutter.fontWeight,
+        fontWeight: codemirrorThemeUtils.generalGutter.fontWeight,
     },
     '.cm-lineNumbers': {
-        fontSize: utils.generalGutter.fontSize,
+        fontSize: codemirrorThemeUtils.generalGutter.fontSize,
     },
     '.cm-foldGutter': {
-        fontSize: utils.generalGutter.fontSize,
+        fontSize: codemirrorThemeUtils.generalGutter.fontSize,
     },
     '.cm-foldGutter .cm-gutterElement': {
         color: base04,
@@ -145,23 +145,23 @@ const androidStudioTheme = view.EditorView.theme({
     '.cm-tooltip': {
         backgroundColor: tooltipBackground,
         border: '1px solid #5b5b5b',
-        borderRadius: utils.generalTooltip.borderRadius,
-        padding: utils.generalTooltip.padding,
+        borderRadius: codemirrorThemeUtils.generalTooltip.borderRadius,
+        padding: codemirrorThemeUtils.generalTooltip.padding,
         boxShadow: '0 2px 8px rgba(0, 0, 0, 0.3)',
     },
     '.cm-tooltip-autocomplete': {
         '& > ul > li': {
-            padding: utils.generalTooltip.padding,
-            lineHeight: utils.generalTooltip.lineHeight,
+            padding: codemirrorThemeUtils.generalTooltip.padding,
+            lineHeight: codemirrorThemeUtils.generalTooltip.lineHeight,
         },
         '& > ul > li[aria-selected]': {
             backgroundColor: selectionBackground,
             color: selectionForeground,
-            borderRadius: utils.generalTooltip.borderRadiusSelected,
+            borderRadius: codemirrorThemeUtils.generalTooltip.borderRadiusSelected,
         },
         '& > ul > li > span.cm-completionIcon': {
             color: base04,
-            paddingRight: utils.generalTooltip.paddingRight,
+            paddingRight: codemirrorThemeUtils.generalTooltip.paddingRight,
         },
         '& > ul > li > span.cm-completionDetail': {
             color: base04,
@@ -198,27 +198,27 @@ const androidStudioTheme = view.EditorView.theme({
     '.cm-matchingBracket': {
         backgroundColor: activeBracketBg,
         outline: `1px solid ${activeBracketBorder}`,
-        borderRadius: utils.generalMatching.borderRadius,
+        borderRadius: codemirrorThemeUtils.generalMatching.borderRadius,
     },
     '.cm-nonmatchingBracket': {
         backgroundColor: '#53383e',
         outline: `1px solid ${invalid}`,
-        borderRadius: utils.generalMatching.borderRadius,
+        borderRadius: codemirrorThemeUtils.generalMatching.borderRadius,
     },
     // Selection matches
     '.cm-selectionMatch': {
         backgroundColor: '#32593d40',
         outline: `1px solid ${base0D}`,
-        borderRadius: utils.generalMatching.borderRadius,
+        borderRadius: codemirrorThemeUtils.generalMatching.borderRadius,
     },
     // Fold placeholder
     '.cm-foldPlaceholder': {
         backgroundColor: tooltipBackground,
         color: '#a1a1a1',
         border: `1px dotted ${base04}`,
-        borderRadius: utils.generalPlaceholder.borderRadius,
-        padding: utils.generalPlaceholder.padding,
-        margin: utils.generalPlaceholder.margin,
+        borderRadius: codemirrorThemeUtils.generalPlaceholder.borderRadius,
+        padding: codemirrorThemeUtils.generalPlaceholder.padding,
+        margin: codemirrorThemeUtils.generalPlaceholder.margin,
     },
     // Focus outline
     '&.cm-focused': {
@@ -227,15 +227,15 @@ const androidStudioTheme = view.EditorView.theme({
     },
     // Scrollbars
     '& .cm-scroller::-webkit-scrollbar': {
-        width: utils.generalScroller.width,
-        height: utils.generalScroller.height,
+        width: codemirrorThemeUtils.generalScroller.width,
+        height: codemirrorThemeUtils.generalScroller.height,
     },
     '& .cm-scroller::-webkit-scrollbar-track': {
         background: darkBackground,
     },
     '& .cm-scroller::-webkit-scrollbar-thumb': {
         backgroundColor: '#5a5a5a',
-        borderRadius: utils.generalScroller.borderRadius,
+        borderRadius: codemirrorThemeUtils.generalScroller.borderRadius,
         border: `3px solid ${darkBackground}`,
     },
     '& .cm-scroller::-webkit-scrollbar-thumb:hover': {

package/dist/index.js

@@ -1,7 +1,7 @@
 import { EditorView } from '@codemirror/view';
 import { HighlightStyle, syntaxHighlighting } from '@codemirror/language';
 import { tags } from '@lezer/highlight';
-import { generalScroller, generalPlaceholder, generalMatching, generalTooltip, generalGutter, generalLine, generalPanel, generalSearchField, generalCursor, generalContent } from '../../.helper/utils';
+import { generalScroller, generalPlaceholder, generalMatching, generalTooltip, generalGutter, generalLine, generalPanel, generalSearchField, generalCursor, generalContent } from '@fsegurai/codemirror-theme-utils';
 
 /**
  * Enhanced Android Studio theme color palette

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fsegurai/codemirror-theme-android-studio",
   "description": "Android Studio theme for the CodeMirror code editor",
-  "version": "6.2.0-beta.2",
+  "version": "6.2.0-beta.4",
   "type": "module",
   "main": "dist/index.cjs",
   "exports": {
@@ -36,7 +36,8 @@
     "@lezer/highlight": "^1.0.0",
     "@codemirror/language": "^6.0.0",
     "@codemirror/state": "^6.0.0",
-    "@codemirror/view": "^6.0.0"
+    "@codemirror/view": "^6.0.0",
+    "@fsegurai/codemirror-theme-utils": "6.2.0-beta.3"
   },
   "devDependencies": {
     "@codemirror/buildhelper": "^1.0.2"