mbeditor 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45f561cf7e36141944025bc54ce679c4492a7c7315902532e350eab44b138361
-  data.tar.gz: 7612a0802d9c8e65d0539b621362b0adc3f09866bf131b14b707efafcd35e752
+  metadata.gz: 414b42474453e80d58cfafbab5db7d5381dd8ebb22ba1e852a10e720eb246d8a
+  data.tar.gz: 0fbaffaedc1aed6196589975816fb9b009df7f4a810dcc41e3aa428d8e19ee37
 SHA512:
-  metadata.gz: c896888e924acc1d11e38a0efcdf6f7caec6013eb02426e4d4a0ee847accb3eb5872e5a40e1d4ca7551892352d9fce72ae4667a9585c8265ec7ffc7927e85341
-  data.tar.gz: d8cbae4ecfd6b3ec04fd5fde655a52cd176830ff38d02c89bd76e7b09372be63b0f227261ec3dcfda2cd79edbe9811a0a2bfddff58a51b2c5d1d36ac199fc3c5
+  metadata.gz: 4bab09aab7ae92d7835838d3c4b240915d0c3ff0c3fc32516a69bdad24430246c86c0da3f508946e9c738ca94a0966d7457903ba9095000a4f01643ca298dbe7
+  data.tar.gz: 522f1e56c9c280ccf9078f9f960ad1c3e3f1d1f99fafc2e9d80c18d539cd6ba409d18cb596b434037e551403623b74c54c7f2f4dfe8c03c90760eebe8b51862c

data/app/assets/javascripts/mbeditor/application.js

@@ -1,4 +1,5 @@
 //= require mbeditor/editor_store
+//= require mbeditor/file_icon
 //= require mbeditor/file_service
 //= require mbeditor/git_service
 //= require mbeditor/search_service

data/app/assets/javascripts/mbeditor/components/DiffViewer.js

@@ -83,10 +83,12 @@ var DiffViewer = function DiffViewer(_ref) {
 
   function getLanguageForPath(filePath) {
     if (!filePath) return 'plaintext';
+    var fileName = filePath.split('/').pop().toLowerCase();
+    if (fileName === 'gemfile' || fileName === 'gemfile.lock' || fileName === 'rakefile') return 'ruby';
     var ext = filePath.split('.').pop().toLowerCase();
     var map = {
       'rb': 'ruby', 'js': 'javascript', 'jsx': 'javascript',
-      'ts': 'javascript', 'tsx': 'javascript',
+      'ts': 'typescript', 'tsx': 'typescript',
       'json': 'json', 'yml': 'yaml', 'yaml': 'yaml',
       'css': 'css', 'scss': 'scss', 'html': 'html',
       'xml': 'xml', 'md': 'markdown', 'sh': 'shell'

data/app/assets/javascripts/mbeditor/components/EditorPanel.js

@@ -75,16 +75,23 @@ var EditorPanel = function EditorPanel(_ref) {
       window.MbeditorEditorPlugins.registerGlobalExtensions(window.monaco);
     }
 
-    var parts = tab.path.split('.');
+    var fileName = tab.path.split('/').pop() || '';
+    var parts = fileName.split('.');
     var extension = parts.length > 1 ? parts.pop().toLowerCase() : '';
     var language = 'plaintext';
-    switch (extension) {
-      case 'rb':case 'ruby':case 'gemspec':case 'rakefile':
+    switch (fileName.toLowerCase()) {
+      case 'gemfile':
+      case 'gemfile.lock':
+      case 'rakefile':
         language = 'ruby';break;
+      default:
+        switch (extension) {
+      case 'rb':case 'ruby':case 'gemspec':
+          language = 'ruby';break;
       case 'js':case 'jsx':
         language = 'javascript';break;
       case 'ts':case 'tsx':
-        language = 'javascript';break;
+        language = 'typescript';break;
       case 'css':case 'scss':case 'sass':
         language = 'css';break;
       case 'html':case 'erb':
@@ -101,6 +108,7 @@ var EditorPanel = function EditorPanel(_ref) {
         language = 'shell';break;
       case 'png':case 'jpg':case 'jpeg':case 'gif':case 'svg':case 'ico':case 'webp':case 'bmp':case 'avif':
         language = 'image';break;
+        }
     }
 
     if (language === 'image') return;

data/app/assets/javascripts/mbeditor/components/FileTree.js

@@ -109,23 +109,6 @@ var FileTree = function FileTree(_ref) {
     return { badge: key || '?', cssKey: key || 'Q', title: titleMap[key] || 'Status' };
   };
 
-  window.getFileIcon = function (name) {
-    var ext = name.split('.').pop().toLowerCase();
-    var lName = name.toLowerCase();
-    if (lName === 'gemfile' || ext === 'gemspec' || ext === 'lock') return 'fas fa-gem ruby-icon';
-    if (ext === 'rb' || ext === 'rake' || lName === 'rakefile') return 'far fa-gem ruby-icon';
-    if (ext === 'jsx' || name.endsWith('.js.jsx')) return 'fas fa-atom react-icon';
-    if (ext === 'js' || ext === 'mjs' || ext === 'cjs') return 'fa-brands fa-js js-icon';
-    if (ext === 'html') return 'fa-brands fa-html5 html-icon';
-    if (ext === 'erb') return 'fa-brands fa-html5 erb-icon';
-    if (ext === 'css' || ext === 'scss' || ext === 'sass') return 'fa-brands fa-css3-alt css-icon';
-    if (['png', 'jpg', 'jpeg', 'gif', 'svg', 'ico', 'webp', 'bmp', 'avif'].includes(ext)) return 'far fa-file-image image-icon';
-    if (ext === 'json') return 'fas fa-code json-icon';
-    if (ext === 'md' || ext === 'txt') return 'fas fa-file-alt md-icon';
-    if (ext === 'yml' || ext === 'yaml') return 'fas fa-cogs yml-icon';
-    return 'far fa-file-code';
-  };
-
   var handleInlineKeyDown = function handleInlineKeyDown(e) {
     var isRename = !!pendingRename;
     if (e.key === 'Enter') {

data/app/assets/javascripts/mbeditor/components/GitPanel.js

@@ -16,6 +16,7 @@ var GitPanel = function GitPanel(_ref) {
   var _s4 = useState({});    var expandedCommits = _s4[0]; var setExpandedCommits = _s4[1];
   // { [hash]: { loading, files: [{status,path}], error } }
   var _s5 = useState({});    var commitFiles = _s5[0]; var setCommitFiles = _s5[1];
+  var _s6 = useState(false); var refreshing = _s6[0]; var setRefreshing = _s6[1];
 
   var workingTree     = gitInfo && gitInfo.workingTree     || [];
   var unpushedFiles   = gitInfo && gitInfo.unpushedFiles   || [];
@@ -46,36 +47,7 @@ var GitPanel = function GitPanel(_ref) {
   };
 
   var fileIcon = function fileIcon(filename) {
-    var ext = (filename || '').split('.').pop().toLowerCase();
-    var iconMap = {
-      'rb':      { cls: 'fas fa-gem',      color: '#cc342d' },
-      'gemspec': { cls: 'fas fa-gem',      color: '#cc342d' },
-      'js':      { cls: 'fab fa-js',       color: '#f0db4f' },
-      'ts':      { cls: 'fas fa-code',     color: '#3178c6' },
-      'jsx':     { cls: 'fab fa-js',       color: '#61dafb' },
-      'tsx':     { cls: 'fas fa-code',     color: '#61dafb' },
-      'html':    { cls: 'fab fa-html5',    color: '#e34f26' },
-      'htm':     { cls: 'fab fa-html5',    color: '#e34f26' },
-      'erb':     { cls: 'fab fa-html5',    color: '#cc342d' },
-      'css':     { cls: 'fab fa-css3-alt', color: '#1572b6' },
-      'scss':    { cls: 'fab fa-sass',     color: '#cc6699' },
-      'sass':    { cls: 'fab fa-sass',     color: '#cc6699' },
-      'md':      { cls: 'fab fa-markdown', color: '#7f8b97' },
-      'json':    { cls: 'fas fa-code',     color: '#ffe082' },
-      'yml':     { cls: 'fas fa-cog',      color: '#888' },
-      'yaml':    { cls: 'fas fa-cog',      color: '#888' },
-      'png':     { cls: 'fas fa-image',    color: '#aaa' },
-      'jpg':     { cls: 'fas fa-image',    color: '#aaa' },
-      'jpeg':    { cls: 'fas fa-image',    color: '#aaa' },
-      'gif':     { cls: 'fas fa-image',    color: '#aaa' },
-      'svg':     { cls: 'fas fa-image',    color: '#aaa' },
-      'txt':     { cls: 'fas fa-file-alt', color: '#888' },
-      'sh':      { cls: 'fas fa-terminal', color: '#89d185' },
-      'lock':    { cls: 'fas fa-lock',     color: '#888' },
-      'pdf':     { cls: 'fas fa-file-pdf', color: '#f48771' },
-    };
-    var icon = iconMap[ext] || { cls: 'fas fa-file-code', color: '#7f8b97' };
-    return React.createElement('i', { className: icon.cls + ' git-file-type-icon', style: { color: icon.color } });
+    return React.createElement('i', { className: (window.getFileIcon ? window.getFileIcon(filename) : 'far fa-file-code') + ' git-file-type-icon' });
   };
 
   // Renders a file row used in Local Changes and Changes in Branch sections
@@ -148,6 +120,23 @@ var GitPanel = function GitPanel(_ref) {
     }
   };
 
+  var handleRefresh = function handleRefresh() {
+    if (!onRefresh || refreshing) return;
+
+    var result;
+    try {
+      setRefreshing(true);
+      result = onRefresh();
+    } catch (err) {
+      setRefreshing(false);
+      throw err;
+    }
+
+    return Promise.resolve(result).finally(function () {
+      setRefreshing(false);
+    });
+  };
+
   var renderCommit = function renderCommit(commit, idx) {
     var isFirst = idx === 0;
     var isLast = idx === branchCommits.length - 1;
@@ -305,8 +294,8 @@ var GitPanel = function GitPanel(_ref) {
         { className: 'ide-git-panel-actions' },
         onRefresh && React.createElement(
           'button',
-          { className: 'git-header-btn', onClick: onRefresh, title: 'Refresh' },
-          React.createElement('i', { className: 'fas fa-sync-alt' })
+          { className: 'git-header-btn', onClick: handleRefresh, title: 'Refresh', disabled: refreshing, 'aria-busy': refreshing },
+          React.createElement('i', { className: 'fas fa-sync-alt' + (refreshing ? ' fa-spin' : '') })
         ),
         onClose && React.createElement(
           'button',

data/app/assets/javascripts/mbeditor/components/MbeditorApp.js

@@ -121,6 +121,13 @@ var MbeditorApp = function MbeditorApp() {
   var searchQuery = _useState72[0];
   var setSearchQuery = _useState72[1];
 
+  var _useState33 = useState(false);
+  var _useState332 = _slicedToArray(_useState33, 2);
+  var searchLoading = _useState332[0];
+  var setSearchLoading = _useState332[1];
+
+  var searchRequestIdRef = useRef(0);
+
   var _useState8 = useState("explorer");
 
   var _useState82 = _slicedToArray(_useState8, 2);
@@ -1067,12 +1074,22 @@ var MbeditorApp = function MbeditorApp() {
 
   var _debouncedSearch = useRef(window._.debounce(function (q) {
     if (!q.trim()) {
+      searchRequestIdRef.current += 1;
+      setSearchLoading(false);
       EditorStore.setState({ searchResults: [] });
       return;
     }
+    var requestId = ++searchRequestIdRef.current;
+    setSearchLoading(true);
     EditorStore.setStatus("Searching project...", "info");
     SearchService.projectSearch(q).then(function (res) {
-      EditorStore.setStatus("Found " + res.length + " results", "success");
+      if (searchRequestIdRef.current === requestId) {
+        EditorStore.setStatus("Found " + res.length + " results", "success");
+      }
+    }).finally(function () {
+      if (searchRequestIdRef.current === requestId) {
+        setSearchLoading(false);
+      }
     });
   }, 400)).current;
 
@@ -1082,6 +1099,14 @@ var MbeditorApp = function MbeditorApp() {
     _debouncedSearch(val);
   };
 
+  var clearSearch = function clearSearch() {
+    searchRequestIdRef.current += 1;
+    if (_debouncedSearch.cancel) _debouncedSearch.cancel();
+    setSearchQuery("");
+    setSearchLoading(false);
+    EditorStore.setState({ searchResults: [] });
+  };
+
   var execSearch = function execSearch(e) {
     e.preventDefault();
     _debouncedSearch(searchQuery);
@@ -1765,16 +1790,31 @@ var MbeditorApp = function MbeditorApp() {
           React.createElement(
             "div",
             { className: "search-input-wrap" },
-            React.createElement("input", {
-              className: "search-input",
-              placeholder: "Find in files...",
-              value: searchQuery,
-              onChange: handleSearchChange
-            }),
+            React.createElement(
+              "div",
+              { className: "search-input-shell" },
+              React.createElement("input", {
+                className: "search-input",
+                placeholder: "Find in files...",
+                value: searchQuery,
+                onChange: handleSearchChange
+              }),
+              searchQuery && React.createElement(
+                "button",
+                {
+                  type: "button",
+                  className: "search-clear-btn",
+                  onClick: clearSearch,
+                  title: "Clear search",
+                  "aria-label": "Clear search"
+                },
+                React.createElement("i", { className: "fas fa-times" })
+              )
+            ),
             React.createElement(
               "button",
-              { type: "submit", className: "search-btn" },
-              React.createElement("i", { className: "fas fa-search" })
+              { type: "submit", className: "search-btn", disabled: searchLoading, title: searchLoading ? "Searching..." : "Search" },
+              React.createElement("i", { className: searchLoading ? "fas fa-spinner fa-spin" : "fas fa-search" })
             )
           ),
           React.createElement(
@@ -1797,28 +1837,35 @@ var MbeditorApp = function MbeditorApp() {
               "No results"
             ),
             state.searchResults.map(function (res, i) {
+              var fileName = res.file.split('/').pop();
               return React.createElement(
                 "div",
                 { key: i, className: "search-result-item", onClick: function () {
                     return handleSelectFile(res.file, res.file.split('/').pop(), res.line);
                   } },
+                React.createElement("i", { className: (window.getFileIcon ? window.getFileIcon(fileName) : 'far fa-file-code') + " search-result-icon" }),
                 React.createElement(
                   "div",
-                  { className: "search-result-file" },
-                  res.file,
-                  " ",
+                  { className: "search-result-body" },
                   React.createElement(
-                    "span",
-                    { className: "search-result-line-num" },
-                    ":",
-                    res.line
+                    "div",
+                    { className: "search-result-file" },
+                    fileName,
+                    React.createElement(
+                      "span",
+                      { className: "search-result-line-num" },
+                      " ",
+                      res.file,
+                      ":",
+                      res.line
+                    )
+                  ),
+                  React.createElement(
+                    "div",
+                    { className: "search-result-text" },
+                    res.text
                   )
                 ),
-                React.createElement(
-                  "div",
-                  { className: "search-result-text" },
-                  res.text
-                )
               );
             })
           )

data/app/assets/javascripts/mbeditor/components/QuickOpenDialog.js

@@ -34,6 +34,18 @@ var QuickOpenDialog = function QuickOpenDialog(_ref) {
 
   var inputRef = useRef(null);
 
+  var clearQuery = function clearQuery() {
+    setQuery('');
+    setResults([]);
+    setSelectedIndex(0);
+    if (inputRef.current) inputRef.current.focus();
+  };
+
+  var getQuickOpenIcon = function getQuickOpenIcon(path, name) {
+    var iconClass = window.getFileIcon ? window.getFileIcon(path || name || '') : 'far fa-file-code';
+    return React.createElement('i', { className: iconClass + ' quick-open-result-icon', 'aria-hidden': 'true' });
+  };
+
   useEffect(function () {
     if (inputRef.current) inputRef.current.focus();
   }, []);
@@ -66,17 +78,32 @@ var QuickOpenDialog = function QuickOpenDialog(_ref) {
       { className: "quick-open-box", onClick: function (e) {
           return e.stopPropagation();
         } },
-      React.createElement("input", {
-        ref: inputRef,
-        type: "text",
-        className: "quick-open-input",
-        placeholder: "Search files by name (Ctrl+P)...",
-        value: query,
-        onChange: function (e) {
-          return setQuery(e.target.value);
-        },
-        onKeyDown: handleKeyDown
-      }),
+      React.createElement(
+        "div",
+        { className: "quick-open-input-wrap" },
+        React.createElement("input", {
+          ref: inputRef,
+          type: "text",
+          className: "quick-open-input",
+          placeholder: "Search files by name (Ctrl+P)...",
+          value: query,
+          onChange: function (e) {
+            return setQuery(e.target.value);
+          },
+          onKeyDown: handleKeyDown
+        }),
+        query && React.createElement(
+          "button",
+          {
+            type: "button",
+            className: "quick-open-clear-btn",
+            onClick: clearQuery,
+            title: "Clear search",
+            "aria-label": "Clear search"
+          },
+          React.createElement("i", { className: "fas fa-times" })
+        )
+      ),
       React.createElement(
         "div",
         { className: "quick-open-results" },
@@ -93,15 +120,20 @@ var QuickOpenDialog = function QuickOpenDialog(_ref) {
                 return setSelectedIndex(i);
               }
             },
+            getQuickOpenIcon(res.path, res.name),
             React.createElement(
               "div",
-              { className: "quick-open-result-name" },
-              res.name
-            ),
-            React.createElement(
-              "div",
-              { className: "quick-open-result-path" },
-              res.path
+              { className: "quick-open-result-body" },
+              React.createElement(
+                "div",
+                { className: "quick-open-result-name" },
+                res.name
+              ),
+              React.createElement(
+                "div",
+                { className: "quick-open-result-path" },
+                res.path
+              )
             )
           );
         }),

data/app/assets/javascripts/mbeditor/file_icon.js

@@ -0,0 +1,30 @@
+var MbeditorFileIcon = (function () {
+  function getFileIcon(name) {
+    var value = String(name || '');
+    var lower = value.toLowerCase();
+    var parts = lower.split('.');
+    var ext = parts.length > 1 ? parts.pop() : '';
+
+    if (lower === 'gemfile' || ext === 'gemspec' || ext === 'lock') return 'fas fa-gem ruby-icon';
+    if (ext === 'rb' || ext === 'rake' || lower === 'rakefile') return 'far fa-gem ruby-icon';
+    if (ext === 'jsx' || lower.endsWith('.js.jsx')) return 'fas fa-atom react-icon';
+    if (ext === 'js' || ext === 'mjs' || ext === 'cjs') return 'fa-brands fa-js js-icon';
+    if (ext === 'ts' || ext === 'tsx') return 'fas fa-code typescript-icon';
+    if (ext === 'html' || ext === 'htm') return 'fa-brands fa-html5 html-icon';
+    if (ext === 'erb') return 'fa-brands fa-html5 erb-icon';
+    if (ext === 'css' || ext === 'scss' || ext === 'sass') return 'fa-brands fa-css3-alt css-icon';
+    if (['png', 'jpg', 'jpeg', 'gif', 'svg', 'ico', 'webp', 'bmp', 'avif'].includes(ext)) return 'far fa-file-image image-icon';
+    if (ext === 'json') return 'fas fa-code json-icon';
+    if (ext === 'md' || ext === 'txt') return 'fas fa-file-alt md-icon';
+    if (ext === 'yml' || ext === 'yaml') return 'fas fa-cogs yml-icon';
+    if (ext === 'sh' || ext === 'bash' || ext === 'zsh') return 'fas fa-terminal shell-icon';
+    if (ext === 'pdf') return 'far fa-file-pdf pdf-icon';
+
+    return 'far fa-file-code';
+  }
+
+  return { getFileIcon: getFileIcon };
+})();
+
+window.MbeditorFileIcon = MbeditorFileIcon;
+window.getFileIcon = window.getFileIcon || MbeditorFileIcon.getFileIcon;

data/app/assets/stylesheets/mbeditor/editor.css

@@ -663,19 +663,47 @@ html, body, #mbeditor-root {
   gap: 6px;
 }
 
-.search-input {
+.search-input-shell {
+  position: relative;
   flex: 1;
+  min-width: 0;
+}
+
+.search-input {
+  width: 100%;
   background: #3c3c3c;
   border: 1px solid #555;
   border-radius: 4px;
   color: #ccc;
-  padding: 4px 8px;
+  padding: 4px 28px 4px 8px;
   font-size: 12px;
   outline: none;
 }
 
 .search-input:focus { border-color: #4ec9b0; }
 
+.search-clear-btn {
+  position: absolute;
+  right: 4px;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 20px;
+  height: 20px;
+  border: none;
+  border-radius: 3px;
+  background: transparent;
+  color: #aaa;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.search-clear-btn:hover {
+  background: #2a2d2e;
+  color: #ddd;
+}
+
 .search-btn {
   background: #094771;
   border: none;
@@ -689,6 +717,11 @@ html, body, #mbeditor-root {
 
 .search-btn:hover { background: #0e639c; }
 
+.search-btn:disabled {
+  cursor: progress;
+  opacity: 0.85;
+}
+
 .search-results {
   flex: 1;
   overflow-y: auto;
@@ -700,10 +733,26 @@ html, body, #mbeditor-root {
   border-radius: 3px;
   transition: background 0.1s;
   border-bottom: 1px solid #2d2d2d;
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
 }
 
 .search-result-item:hover { background: #2a2d2e; }
 
+.search-result-icon {
+  flex-shrink: 0;
+  width: 16px;
+  margin-top: 2px;
+  text-align: center;
+  color: #78b4e0;
+}
+
+.search-result-body {
+  min-width: 0;
+  flex: 1;
+}
+
 .search-result-file {
   font-size: 11px;
   color: #4ec9b0;
@@ -883,6 +932,7 @@ html, body, #mbeditor-root {
   display: flex;
   flex-direction: column;
   flex-shrink: 0;
+  min-height: 0;
 }
 
 /* Only stretch when the graph section is open */
@@ -893,6 +943,7 @@ html, body, #mbeditor-root {
 
 .ide-git-right-panel .git-history-graph-wrap {
   flex: 1;
+  min-height: 0;
   overflow-y: auto;
   overflow-x: hidden;
 }
@@ -1211,17 +1262,43 @@ html, body, #mbeditor-root {
   overflow: hidden;
 }
 
+.quick-open-input-wrap {
+  position: relative;
+}
+
 .quick-open-input {
   background: transparent;
   border: none;
   border-bottom: 1px solid #3c3c3c;
   color: #ccc;
-  padding: 12px 16px;
+  padding: 12px 34px 12px 16px;
   font-size: 14px;
   outline: none;
   width: 100%;
 }
 
+.quick-open-clear-btn {
+  position: absolute;
+  right: 6px;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 22px;
+  height: 22px;
+  border: none;
+  border-radius: 4px;
+  background: transparent;
+  color: #999;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.quick-open-clear-btn:hover {
+  background: #2a2d2e;
+  color: #ddd;
+}
+
 .quick-open-results {
   overflow-y: auto;
   flex: 1;
@@ -1237,11 +1314,27 @@ html, body, #mbeditor-root {
   transition: background 0.1s;
 }
 
+.quick-open-result-icon {
+  flex-shrink: 0;
+  width: 16px;
+  text-align: center;
+  color: #78b4e0;
+}
+
+.quick-open-result-body {
+  min-width: 0;
+  flex: 1;
+}
+
 .quick-open-result:hover,
 .quick-open-result.selected { background: #094771; }
 
-.quick-open-result-name { color: #ccc; flex: 1; }
-.quick-open-result-path { color: #666; font-size: 11px; }
+.quick-open-result-name { color: #ccc; }
+.quick-open-result-path { color: #666; font-size: 11px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+
+.typescript-icon { color: #3178c6 !important; }
+.shell-icon { color: #89d185 !important; }
+.pdf-icon { color: #f48771 !important; }
 
 /* ── Scrollbars ────────────────────────────────────────────── */
 ::-webkit-scrollbar { width: 8px; height: 8px; }

data/app/controllers/mbeditor/editors_controller.rb

@@ -292,7 +292,7 @@ module Mbeditor
         unpushed_commits = parse_git_log(unpushed_log_output) if unpushed_log_status.success?
       end
 
-      branch_log_output, branch_log_status = Open3.capture2("git", "-C", repo, "log", branch, "-n", "100", "--pretty=format:%H%x1f%s%x1f%an%x1f%aI%x1e")
+      branch_log_output, branch_log_status = Open3.capture2("git", "-C", repo, "log", "--first-parent", branch, "-n", "100", "--pretty=format:%H%x1f%s%x1f%an%x1f%aI%x1e")
       branch_commits = branch_log_status.success? ? parse_git_log(branch_log_output) : []
 
       render json: {

data/lib/mbeditor/version.rb

@@ -1,3 +1,3 @@
 module Mbeditor
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/public/monaco-editor/vs/basic-languages/shell/shell.js

@@ -0,0 +1,41 @@
+define("vs/basic-languages/shell/shell", [], function () {
+  "use strict";
+
+  return {
+    conf: {
+      comments: { lineComment: "#" },
+      brackets: [["{", "}"], ["[", "]"], ["(", ")"]],
+      autoClosingPairs: [
+        { open: "{", close: "}" },
+        { open: "[", close: "]" },
+        { open: "(", close: ")" },
+        { open: '"', close: '"' },
+        { open: "'", close: "'" }
+      ],
+      surroundingPairs: [
+        { open: "{", close: "}" },
+        { open: "[", close: "]" },
+        { open: "(", close: ")" },
+        { open: '"', close: '"' },
+        { open: "'", close: "'" }
+      ]
+    },
+    language: {
+      defaultToken: "",
+      tokenPostfix: ".sh",
+      keywords: ["if", "then", "else", "elif", "fi", "for", "while", "until", "do", "done", "case", "esac", "function", "select", "in", "time", "coproc"],
+      tokenizer: {
+        root: [
+          [/#.*$/, "comment"],
+          [/"([^"\\]|\\.)*"/, "string"],
+          [/'([^'\\]|\\.)*'/, "string"],
+          [/\b(?:if|then|else|elif|fi|for|while|until|do|done|case|esac|function|select|in|time|coproc)\b/, "keyword"],
+          [/[{}()\[\]]/, "@brackets"],
+          [/\$\{?[a-zA-Z_][\w-]*\}?/, "variable"],
+          [/[a-zA-Z_][\w-]*/, "identifier"],
+          [/\s+/, ""]
+        ]
+      }
+    }
+  };
+});

data/public/monaco-editor/vs/basic-languages/typescript/typescript.js

@@ -0,0 +1,10 @@
+define("vs/basic-languages/typescript/typescript", ["vs/basic-languages/javascript/javascript"], function (javascript) {
+  "use strict";
+
+  return {
+    conf: javascript.conf,
+    language: Object.assign({}, javascript.language, {
+      tokenPostfix: ".ts"
+    })
+  };
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mbeditor
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Oliver Noonan
@@ -69,6 +69,7 @@ files:
 - app/assets/javascripts/mbeditor/components/TabBar.js
 - app/assets/javascripts/mbeditor/editor_plugins.js
 - app/assets/javascripts/mbeditor/editor_store.js
+- app/assets/javascripts/mbeditor/file_icon.js
 - app/assets/javascripts/mbeditor/file_service.js
 - app/assets/javascripts/mbeditor/git_service.js
 - app/assets/javascripts/mbeditor/search_service.js
@@ -112,6 +113,8 @@ files:
 - public/monaco-editor/vs/basic-languages/restructuredtext/restructuredtext.js
 - public/monaco-editor/vs/basic-languages/ruby/ruby.js
 - public/monaco-editor/vs/basic-languages/sb/sb.js
+- public/monaco-editor/vs/basic-languages/shell/shell.js
+- public/monaco-editor/vs/basic-languages/typescript/typescript.js
 - public/monaco-editor/vs/basic-languages/typespec/typespec.js
 - public/monaco-editor/vs/basic-languages/yaml/yaml.js
 - public/monaco-editor/vs/editor/editor.main.css