@fsegurai/codemirror-theme-catppuccin-mocha 6.0.0 → 6.0.1

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 fsegurai
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img alt="CodeMirror 6 Themes Logo" src="https://raw.githubusercontent.com/fsegurai/codemirror-themes/main/demo/public/codemirror-themes.png">
+  <img alt="CodeMirror 6 Themes Logo" src="https://raw.githubusercontent.com/fsegurai/codemirror-themes/main/demo/public/codemirror-themes.svg">
 </p>
 
 <p align="center">
@@ -31,6 +31,7 @@
 - [Installation](#installation)
 	- [@fsegurai/codemirror-theme-catppuccin-mocha](#@fsegurai/codemirror-theme-catppuccin-mocha)
 	- [Using Theme](#using-theme)
+- [More Resources](#more-resources)
 	- [Available Themes](#available-themes)
 	- [Demo Application](#demo-application)
 - [License](#license)
@@ -89,6 +90,7 @@ Read the [CodeMirror documentation](https://codemirror.net/6/examples/styling/)
 | High Contrast Light | [@fsegurai/codemirror-theme-high-contrast-light](https://www.npmjs.com/package/@fsegurai/codemirror-theme-high-contrast-light) | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-high-contrast-light) |
 | Material Dark       | [@fsegurai/codemirror-theme-material-dark](https://www.npmjs.com/package/@fsegurai/codemirror-theme-material-dark)             | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-material-dark)       |
 | Material Light      | [@fsegurai/codemirror-theme-material-light](https://www.npmjs.com/package/@fsegurai/codemirror-theme-material-light)           | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-material-light)      |
+| Material Ocean      | [@fsegurai/codemirror-theme-material-ocean](https://www.npmjs.com/package/@fsegurai/codemirror-theme-material-ocean)           | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-material-ocean)      |
 | Monokai             | [@fsegurai/codemirror-theme-monokai](https://www.npmjs.com/package/@fsegurai/codemirror-theme-monokai)                         | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-monokai)             |
 | Nord                | [@fsegurai/codemirror-theme-nord](https://www.npmjs.com/package/@fsegurai/codemirror-theme-nord)                               | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-nord)                |
 | Palenight           | [@fsegurai/codemirror-theme-palenight](https://www.npmjs.com/package/@fsegurai/codemirror-theme-palenight)                     | ![npm](https://img.shields.io/npm/v/@fsegurai/codemirror-theme-palenight)           |

package/dist/index.cjs

@@ -17,7 +17,7 @@ const generalDiff = {
     insertedTextDecoration: 'none',
     deletedTextDecoration: 'line-through',
     insertedLinePadding: '1px 3px',
-    borderRadious: '3px'};
+    borderRadius: '3px'};
 const generalGutter = {
     border: 'none',
     paddingRight: '8px',
@@ -243,14 +243,14 @@ const catppuccinMochaTheme = view.EditorView.theme({
         backgroundColor: addedBackground,
         color: addedText,
         padding: generalDiff.insertedLinePadding,
-        borderRadius: generalDiff.borderRadious,
+        borderRadius: generalDiff.borderRadius,
     },
     'ins.cm-insertedLine, ins.cm-insertedLine:not(:has(.cm-changedText))': {
         textDecoration: generalDiff.insertedTextDecoration,
         backgroundColor: `${addedBackground} !important`,
         color: addedText,
         padding: generalDiff.insertedLinePadding,
-        borderRadius: generalDiff.borderRadious,
+        borderRadius: generalDiff.borderRadius,
         border: `1px solid ${addedText}40`,
     },
     'ins.cm-insertedLine .cm-changedText': {
@@ -261,14 +261,14 @@ const catppuccinMochaTheme = view.EditorView.theme({
         backgroundColor: removedBackground,
         color: removedText,
         padding: generalDiff.insertedLinePadding,
-        borderRadius: generalDiff.borderRadious,
+        borderRadius: generalDiff.borderRadius,
     },
     'del.cm-deletedLine, del, del:not(:has(.cm-deletedText))': {
         textDecoration: generalDiff.deletedTextDecoration,
         backgroundColor: `${removedBackground} !important`,
         color: removedText,
         padding: generalDiff.insertedLinePadding,
-        borderRadius: generalDiff.borderRadious,
+        borderRadius: generalDiff.borderRadius,
         border: `1px solid ${removedText}40`,
     },
     'del .cm-deletedText, del .cm-changedText': {

package/dist/index.js

@@ -15,7 +15,7 @@ const generalDiff = {
     insertedTextDecoration: 'none',
     deletedTextDecoration: 'line-through',
     insertedLinePadding: '1px 3px',
-    borderRadious: '3px'};
+    borderRadius: '3px'};
 const generalGutter = {
     border: 'none',
     paddingRight: '8px',
@@ -241,14 +241,14 @@ const catppuccinMochaTheme = /*@__PURE__*/EditorView.theme({
         backgroundColor: addedBackground,
         color: addedText,
         padding: generalDiff.insertedLinePadding,
-        borderRadius: generalDiff.borderRadious,
+        borderRadius: generalDiff.borderRadius,
     },
     'ins.cm-insertedLine, ins.cm-insertedLine:not(:has(.cm-changedText))': {
         textDecoration: generalDiff.insertedTextDecoration,
         backgroundColor: `${addedBackground} !important`,
         color: addedText,
         padding: generalDiff.insertedLinePadding,
-        borderRadius: generalDiff.borderRadious,
+        borderRadius: generalDiff.borderRadius,
         border: `1px solid ${addedText}40`,
     },
     'ins.cm-insertedLine .cm-changedText': {
@@ -259,14 +259,14 @@ const catppuccinMochaTheme = /*@__PURE__*/EditorView.theme({
         backgroundColor: removedBackground,
         color: removedText,
         padding: generalDiff.insertedLinePadding,
-        borderRadius: generalDiff.borderRadious,
+        borderRadius: generalDiff.borderRadius,
     },
     'del.cm-deletedLine, del, del:not(:has(.cm-deletedText))': {
         textDecoration: generalDiff.deletedTextDecoration,
         backgroundColor: `${removedBackground} !important`,
         color: removedText,
         padding: generalDiff.insertedLinePadding,
-        borderRadius: generalDiff.borderRadious,
+        borderRadius: generalDiff.borderRadius,
         border: `1px solid ${removedText}40`,
     },
     'del .cm-deletedText, del .cm-changedText': {

package/package.json

@@ -1,20 +1,16 @@
 {
   "name": "@fsegurai/codemirror-theme-catppuccin-mocha",
+  "version": "6.0.1",
   "description": "Catppuccin Mocha theme for the CodeMirror editor",
-  "version": "6.0.0",
   "type": "module",
   "main": "dist/index.cjs",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
   "exports": {
     "import": "./dist/index.js",
     "require": "./dist/index.cjs"
   },
-  "types": "dist/index.d.ts",
-  "module": "dist/index.js",
   "sideEffects": false,
-  "scripts": {
-    "test": "cm-runtests",
-    "prepare": "cm-buildhelper src/index.ts"
-  },
   "keywords": [
     "editor",
     "diff",
@@ -36,6 +32,10 @@
     "url": "https://www.fsegurai.com/"
   },
   "license": "MIT",
+  "scripts": {
+    "pkg:build": "cm-buildhelper src/index.ts",
+    "pkg:test": "cm-runtests"
+  },
   "peerDependencies": {
     "@lezer/highlight": "^1.0.0",
     "@codemirror/language": "^6.0.0",

package/src/index.ts

@@ -1,472 +0,0 @@
-import { EditorView } from '@codemirror/view';
-import { Extension } from '@codemirror/state';
-import { HighlightStyle, syntaxHighlighting } from '@codemirror/language';
-import { tags as t } from '@lezer/highlight';
-
-import {
-  applyMergeRevertStyles,
-  generalContent,
-  generalCursor,
-  generalDiff,
-  generalGutter,
-  generalLine,
-  generalMatching,
-  generalPanel,
-  generalPlaceholder,
-  generalScroller,
-  generalSearchField,
-  generalTooltip,
-  IMergeRevertStyles,
-} from './utils';
-
-/**
- * Catppuccin Mocha theme color definitions
- * ----------------------------------------
- * A soothing pastel theme with warm tones
- */
-
-// Base colors (Mocha variant)
-const base00 = '#1e1e2e', // Background - dark navy
-  base01 = '#313244', // Selection background
-  base02 = '#45475a', // Comments
-  base03 = '#585b70', // Dark grey
-  base04 = '#cdd6f4', // Foreground - light blue
-  base05 = '#f5e0dc', // Light foreground
-
-  // Catppuccin Mocha colors
-  rosewater = '#f5e0dc',
-  flamingo = '#f2cdcd',
-  pink = '#f5c2e7',
-  mauve = '#cba6f7',
-  red = '#f38ba8',
-  maroon = '#eba0ac',
-  peach = '#fab387',
-  yellow = '#f9e2af',
-  green = '#a6e3a1',
-  teal = '#94e2d5',
-  sky = '#89dceb',
-  sapphire = '#74c7ec',
-  blue = '#89b4fa',
-  lavender = '#b4befe';
-
-// UI specific colors
-const invalid = '#f38ba8',
-  darkBackground = '#181825',
-  background = base00,
-  tooltipBackground = base01,
-  selectionMatch = '#45475a80',
-  cursor = rosewater,
-  activeBracketBg = '#45475a55',
-  activeBracketBorder = lavender,
-  diagnosticWarning = yellow,
-  linkColor = blue,
-  visitedLinkColor = mauve;
-
-// Diff/merge specific colors
-const addedBackground = '#a6e3a140',
-  removedBackground = '#f38ba840',
-  addedText = green,
-  removedText = red;
-
-/**
- * Enhanced editor theme styles for Catppuccin Mocha
- */
-const catppuccinMochaTheme = EditorView.theme(
-  {
-    // Base editor styles
-    '&': {
-      color: base04,
-      backgroundColor: background,
-      fontSize: generalContent.fontSize,
-      fontFamily: generalContent.fontFamily,
-    },
-
-    // Content and cursor
-    '.cm-content': {
-      caretColor: cursor,
-      lineHeight: generalContent.lineHeight,
-    },
-    '.cm-cursor, .cm-dropCursor': {
-      borderLeftColor: cursor,
-      borderLeftWidth: generalCursor.borderLeftWidth,
-    },
-    '.cm-fat-cursor': {
-      backgroundColor: `${cursor}99`,
-      color: background,
-    },
-
-    // Selection
-    '&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection':
-      {
-        backgroundColor: '#585b7080',
-        outline: `1px solid ${mauve}`,
-      },
-
-    // Make sure selection appears above active line
-    '.cm-selectionLayer': {
-      zIndex: 100,
-    },
-
-    // Search functionality
-    '.cm-searchMatch': {
-      backgroundColor: '#89b4fa40',
-      outline: `1px solid ${sapphire}`,
-      color: base04,
-      borderRadius: generalSearchField.borderRadius,
-
-      '& span': {
-        color: base04,
-      },
-    },
-    '.cm-searchMatch.cm-searchMatch-selected': {
-      backgroundColor: blue,
-      color: base00,
-      padding: generalSearchField.padding,
-
-      '& span': {
-        color: base00,
-      },
-    },
-    '.cm-search.cm-panel.cm-textfield': {
-      color: base04,
-      borderRadius: generalSearchField.borderRadius,
-      padding: generalSearchField.padding,
-    },
-
-    // Panels
-    '.cm-panels': {
-      backgroundColor: darkBackground,
-      color: base04,
-      borderRadius: '4px',
-    },
-    '.cm-panels.cm-panels-top': {
-      borderBottom: `1px solid ${base02}`,
-    },
-    '.cm-panels.cm-panels-bottom': {
-      borderTop: `1px solid ${base02}`,
-    },
-    '.cm-panel button': {
-      backgroundColor: tooltipBackground,
-      color: base04,
-      border: generalPanel.border,
-      borderRadius: generalPanel.borderRadius,
-      padding: generalPanel.padding,
-    },
-    '.cm-panel button:hover': {
-      backgroundColor: base01,
-    },
-
-    // Line highlighting
-    '.cm-activeLine': {
-      backgroundColor: '#3a3a5266',
-      borderRadius: generalLine.borderRadius,
-      borderLeft: `2px solid ${lavender}`,
-      zIndex: 1,
-    },
-
-    // Gutters
-    '.cm-gutters': {
-      backgroundColor: darkBackground,
-      color: base02,
-      border: generalGutter.border,
-      borderRight: `1px solid ${base01}`,
-      paddingRight: generalGutter.paddingRight,
-    },
-    '.cm-activeLineGutter': {
-      backgroundColor: base01,
-      color: base04,
-      fontWeight: generalGutter.fontWeight,
-    },
-    '.cm-lineNumbers': {
-      fontSize: generalGutter.fontSize,
-      lineHeight: generalGutter.lineHeight,
-    },
-    '.cm-foldGutter': {
-      fontSize: generalGutter.fontSize,
-      lineHeight: generalGutter.lineHeight,
-    },
-    '.cm-foldGutter .cm-gutterElement': {
-      color: base02,
-      cursor: 'pointer',
-    },
-    '.cm-foldGutter .cm-gutterElement:hover': {
-      color: base04,
-    },
-
-    // Diff/Merge View Styles
-    '.cm-insertedLine': {
-      textDecoration: generalDiff.insertedTextDecoration,
-      backgroundColor: addedBackground,
-      color: addedText,
-      padding: generalDiff.insertedLinePadding,
-      borderRadius: generalDiff.borderRadious,
-    },
-    'ins.cm-insertedLine, ins.cm-insertedLine:not(:has(.cm-changedText))': {
-      textDecoration: generalDiff.insertedTextDecoration,
-      backgroundColor: `${addedBackground} !important`,
-      color: addedText,
-      padding: generalDiff.insertedLinePadding,
-      borderRadius: generalDiff.borderRadious,
-      border: `1px solid ${addedText}40`,
-    },
-    'ins.cm-insertedLine .cm-changedText': {
-      background: 'transparent !important',
-    },
-
-    '.cm-deletedLine': {
-      textDecoration: generalDiff.deletedTextDecoration,
-      backgroundColor: removedBackground,
-      color: removedText,
-      padding: generalDiff.insertedLinePadding,
-      borderRadius: generalDiff.borderRadious,
-    },
-    'del.cm-deletedLine, del, del:not(:has(.cm-deletedText))': {
-      textDecoration: generalDiff.deletedTextDecoration,
-      backgroundColor: `${removedBackground} !important`,
-      color: removedText,
-      padding: generalDiff.insertedLinePadding,
-      borderRadius: generalDiff.borderRadious,
-      border: `1px solid ${removedText}40`,
-    },
-    'del .cm-deletedText, del .cm-changedText': {
-      background: 'transparent !important',
-    },
-
-    // Tooltips and autocomplete
-    '.cm-tooltip': {
-      backgroundColor: tooltipBackground,
-      border: `1px solid ${base02}`,
-      borderRadius: generalTooltip.borderRadius,
-      padding: generalTooltip.padding,
-      boxShadow: '0 2px 8px rgba(0, 0, 0, 0.3)',
-    },
-    '.cm-tooltip-autocomplete': {
-      '& > ul': {
-        backgroundColor: tooltipBackground,
-        border: 'none',
-      },
-      '& > ul > li': {
-        padding: generalTooltip.padding,
-        lineHeight: generalTooltip.lineHeight,
-      },
-      '& > ul > li[aria-selected]': {
-        backgroundColor: base01,
-        color: base05,
-        borderRadius: generalTooltip.borderRadiusSelected,
-      },
-      '& > ul > li > span.cm-completionIcon': {
-        color: base02,
-        paddingRight: generalTooltip.paddingRight,
-      },
-      '& > ul > li > span.cm-completionDetail': {
-        color: base02,
-        fontStyle: 'italic',
-      },
-    },
-    '.cm-tooltip .cm-tooltip-arrow:before': {
-      borderTopColor: 'transparent',
-      borderBottomColor: 'transparent',
-    },
-    '.cm-tooltip .cm-tooltip-arrow:after': {
-      borderTopColor: tooltipBackground,
-      borderBottomColor: tooltipBackground,
-    },
-
-    // Diagnostics styling
-    '.cm-diagnostic': {
-      '&-error': {
-        borderLeft: `3px solid ${red}`,
-      },
-      '&-warning': {
-        borderLeft: `3px solid ${diagnosticWarning}`,
-      },
-      '&-info': {
-        borderLeft: `3px solid ${linkColor}`,
-      },
-    },
-    '.cm-lintPoint-error': {
-      borderBottom: `2px wavy ${red}`,
-    },
-    '.cm-lintPoint-warning': {
-      borderBottom: `2px wavy ${diagnosticWarning}`,
-    },
-
-    // Matching brackets
-    '.cm-matchingBracket': {
-      backgroundColor: activeBracketBg,
-      outline: `1px solid ${activeBracketBorder}`,
-      borderRadius: generalMatching.borderRadius,
-    },
-    '.cm-nonmatchingBracket': {
-      backgroundColor: `${red}40`,
-      outline: `1px solid ${invalid}`,
-      borderRadius: generalMatching.borderRadius,
-    },
-
-    // Selection matches
-    '.cm-selectionMatch': {
-      backgroundColor: selectionMatch,
-      outline: `1px solid ${base01}50`,
-      borderRadius: generalMatching.borderRadius,
-    },
-
-    // Fold placeholder
-    '.cm-foldPlaceholder': {
-      backgroundColor: tooltipBackground,
-      color: base02,
-      border: `1px dotted ${base02}70`,
-      borderRadius: generalPlaceholder.borderRadius,
-      padding: generalPlaceholder.padding,
-      margin: generalPlaceholder.margin,
-    },
-
-    // Focus outline
-    '&.cm-focused': {
-      outline: 'none',
-      boxShadow: `0 0 0 2px ${background}, 0 0 0 3px ${lavender}40`,
-    },
-
-    // Scrollbars
-    '& .cm-scroller::-webkit-scrollbar': {
-      width: generalScroller.width,
-      height: generalScroller.height,
-    },
-    '& .cm-scroller::-webkit-scrollbar-track': {
-      background: darkBackground,
-    },
-    '& .cm-scroller::-webkit-scrollbar-thumb': {
-      backgroundColor: base01,
-      borderRadius: generalScroller.borderRadius,
-      border: `3px solid ${darkBackground}`,
-    },
-    '& .cm-scroller::-webkit-scrollbar-thumb:hover': {
-      backgroundColor: base02,
-    },
-
-    // Ghost text
-    '.cm-ghostText': {
-      opacity: '0.5',
-      color: base02,
-    },
-  },
-  { dark: true },
-);
-
-/**
- * Enhanced syntax highlighting for Catppuccin Mocha theme
- */
-const catppuccinMochaHighlightStyle = HighlightStyle.define([
-  // Keywords and control flow
-  { tag: t.keyword, color: mauve, fontWeight: 'bold' },
-  { tag: t.controlKeyword, color: mauve, fontWeight: 'bold' },
-  { tag: t.moduleKeyword, color: mauve, fontWeight: 'bold' },
-
-  // Names and variables
-  { tag: [t.name, t.deleted, t.character, t.macroName], color: base04 },
-  { tag: [t.variableName], color: base04 },
-  { tag: [t.propertyName], color: blue, fontStyle: 'normal' },
-
-  // Classes and types
-  { tag: [t.typeName], color: yellow },
-  { tag: [t.className], color: yellow, fontStyle: 'italic' },
-  { tag: [t.namespace], color: peach, fontStyle: 'italic' },
-
-  // Operators and punctuation
-  { tag: [t.operator, t.operatorKeyword], color: sky },
-  { tag: [t.bracket], color: base03 },
-  { tag: [t.brace], color: teal },
-  { tag: [t.punctuation], color: base03 },
-
-  // Functions and parameters
-  { tag: [t.function(t.variableName), t.labelName], color: blue },
-  { tag: [t.definition(t.function(t.variableName))], color: blue },
-  { tag: [t.definition(t.variableName)], color: peach },
-
-  // Constants and literals
-  { tag: t.number, color: peach },
-  { tag: t.changed, color: yellow },
-  { tag: t.annotation, color: red, fontStyle: 'italic' },
-  { tag: t.modifier, color: mauve, fontStyle: 'italic' },
-  { tag: t.self, color: red },
-  { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: peach },
-  { tag: [t.atom, t.bool, t.special(t.variableName)], color: peach },
-
-  // Strings and regex
-  { tag: [t.processingInstruction, t.inserted], color: green },
-  { tag: [t.special(t.string), t.regexp], color: pink },
-  { tag: t.string, color: green },
-
-  // Punctuation and structure
-  { tag: t.definition(t.typeName), color: yellow, fontWeight: 'bold' },
-  { tag: [t.definition(t.name), t.separator], color: flamingo },
-
-  // Comments and documentation
-  { tag: t.meta, color: base02 },
-  { tag: t.comment, fontStyle: 'italic', color: base02 },
-  { tag: t.docComment, fontStyle: 'italic', color: base02 },
-
-  // HTML/XML elements
-  { tag: [t.tagName], color: pink },
-  { tag: [t.attributeName], color: yellow },
-
-  // Markdown and text formatting
-  { tag: [t.heading], fontWeight: 'bold', color: mauve },
-  { tag: [t.strong], fontWeight: 'bold', color: maroon },
-  { tag: [t.emphasis], fontStyle: 'italic', color: pink },
-
-  // Links and URLs
-  {
-    tag: [t.link],
-    color: visitedLinkColor,
-    fontWeight: '500',
-    textDecoration: 'underline',
-    textUnderlinePosition: 'under',
-  },
-  {
-    tag: [t.url],
-    color: linkColor,
-    textDecoration: 'underline',
-    textUnderlineOffset: '2px',
-  },
-
-  // Special states
-  {
-    tag: [t.invalid],
-    color: red,
-    textDecoration: 'underline wavy',
-    borderBottom: `1px wavy ${red}`,
-  },
-  { tag: [t.strikethrough], color: red, textDecoration: 'line-through' },
-
-  // Enhanced syntax highlighting
-  { tag: t.constant(t.name), color: peach },
-  { tag: t.deleted, color: red },
-  { tag: t.squareBracket, color: maroon },
-  { tag: t.angleBracket, color: sky },
-
-  // Additional specific styles
-  { tag: t.monospace, color: teal, fontStyle: 'italic' },
-  { tag: [t.contentSeparator], color: sapphire },
-  { tag: t.quote, color: lavender },
-]);
-
-/**
- * Combined Catppuccin Mocha theme extension
- */
-const catppuccinMocha: Extension = [
-  catppuccinMochaTheme,
-  syntaxHighlighting(catppuccinMochaHighlightStyle),
-];
-
-/**
- * Catppuccin Mocha merge revert styles configuration
- */
-const catppuccinMochaMergeStyles: IMergeRevertStyles = {
-  backgroundColor: darkBackground,
-  borderColor: base02,
-  buttonColor: base04,
-  buttonHoverColor: base01,
-};
-
-export { catppuccinMocha, catppuccinMochaMergeStyles, applyMergeRevertStyles };
-

package/src/utils.ts

@@ -1,126 +0,0 @@
-// Helper module for styling options
-export const generalContent = {
-  fontSize: '14px',
-  fontFamily: 'JetBrains Mono, Consolas, monospace',
-  lineHeight: '1.6',
-};
-
-export const generalCursor = {
-  borderLeftWidth: '2px',
-};
-
-export const generalDiff = {
-  insertedTextDecoration: 'none',
-  deletedTextDecoration: 'line-through',
-  insertedLinePadding: '1px 3px',
-  borderRadious: '3px',
-  ins_del_linePadding: '1px 3px',
-};
-
-export const generalGutter = {
-  border: 'none',
-  paddingRight: '8px',
-  fontSize: '0.9em',
-  fontWeight: '500',
-  lineHeight: '1.78', // Adjusted to compensate for 0.9em fontSize (1.6 / 0.9 ≈ 1.78)
-};
-
-export const generalPanel = {
-  border: 'none',
-  borderRadius: '4px',
-  padding: '2px 10px',
-};
-
-export const generalLine = {
-  borderRadius: '2px',
-};
-
-export const generalMatching = {
-  borderRadius: '2px',
-};
-
-export const generalPlaceholder = {
-  borderRadius: '4px',
-  padding: '0 5px',
-  margin: '0 2px',
-};
-
-export const generalScroller = {
-  width: '12px',
-  height: '12px',
-  borderRadius: '6px',
-};
-
-export const generalSearchField = {
-  borderRadius: '4px',
-  padding: '2px 6px',
-};
-
-export const generalTooltip = {
-  borderRadius: '4px',
-  borderRadiusSelected: '3px',
-  lineHeight: '1.3',
-  padding: '4px 8px',
-  paddingRight: '8px',
-};
-
-//---------------------------------------
-
-// Interface for merge revert styling options
-export interface IMergeRevertStyles {
-  backgroundColor: string
-  borderColor: string
-  buttonColor: string
-  buttonHoverColor: string
-}
-
-/**
- * Function to apply merge revert styles for a theme
- * @param styles Styles for the merge revert buttons
- * @param styles.backgroundColor Background color of the revert area
- * @param styles.borderColor Border color of the revert area
- * @param styles.buttonColor Color of the revert buttons
- * @param styles.buttonHoverColor Hover color of the revert buttons
- */
-export function applyMergeRevertStyles(styles: IMergeRevertStyles) {
-  // Create a stylesheet
-  const styleEl = document.createElement('style');
-  styleEl.id = 'cm-merge-revert-styles';
-
-  // Define CSS with the theme-specific values
-  styleEl.textContent = `
-    .cm-merge-revert {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: flex-start;
-      padding: 4px;
-      background-color: ${styles.backgroundColor};
-      border-left: 1px solid ${styles.borderColor};
-      border-right: 1px solid ${styles.borderColor};
-      width: 32px;
-    }
-    
-    .cm-merge-revert button {
-      width: 100%;
-      height: auto;
-      background-color: transparent;
-      border: none;
-      color: ${styles.buttonColor};
-      cursor: pointer;
-      margin: 0 auto;
-      font-size: 20px;
-    }
-    
-    .cm-merge-revert button:hover {
-      background-color: ${styles.buttonHoverColor};
-    }
-  `;
-
-  // Remove any existing merge styles
-  const existingStyle = document.getElementById('cm-merge-revert-styles');
-  if (existingStyle) existingStyle.remove();
-
-  // Add the new styles
-  document.head.appendChild(styleEl);
-}