@theia/core 1.21.0-next.24 → 1.21.0

package/src/browser/style/view-container.css

@@ -36,16 +36,41 @@
     min-height: var(--theia-content-line-height);
 }
 
-.theia-view-container > .p-SplitPanel > .p-SplitPanel-handle:after {
-    background-color: var(--theia-sideBarSectionHeader-border);
+.theia-view-container > .p-SplitPanel > .p-SplitPanel-handle::after {
     min-height: 2px;
-    min-width: 2px
+    min-width: 2px;
 }
 
 .theia-view-container > .p-SplitPanel > .p-SplitPanel-handle {
     background-color: var(--theia-sideBarSectionHeader-border);
 }
 
+.p-SplitPanel > .p-SplitPanel-handle:hover::after {
+    background-color: var(--theia-sash-hoverBorder);
+    transition-delay: var(--theia-sash-hoverDelay);
+}
+
+.p-SplitPanel > .p-SplitPanel-handle:active::after {
+    background-color: var(--theia-sash-activeBorder);
+    transition-delay: 0s !important;
+}
+
+.p-SplitPanel[data-orientation='horizontal'] > .p-SplitPanel-handle::after {
+    min-width: var(--theia-sash-width);
+}
+
+.p-SplitPanel[data-orientation='vertical'] > .p-SplitPanel-handle::after {
+    min-height: var(--theia-sash-width);
+}
+
+.p-SplitPanel[data-orientation='vertical'] > .p-SplitPanel-handle.sash-hidden {
+    visibility: hidden;
+}
+
+.p-SplitPanel[data-orientation='vertical'] > .p-SplitPanel-handle.sash-hidden::after {
+    min-height: 0px;
+}
+
 .theia-view-container .part {
     height: 100%;
 }

package/src/browser/view-container.ts

@@ -46,6 +46,11 @@ export interface ViewContainerTitleOptions {
     closeable?: boolean;
 }
 
+enum SashType {
+    TopSash = 'top-sash',
+    BottomSash = 'bottom-sash'
+}
+
 @injectable()
 export class ViewContainerIdentifier {
     id: string;
@@ -994,6 +999,11 @@ export class ViewContainerPart extends BaseWidget {
         }
         this._collapsed = collapsed;
         this.node.classList.toggle('collapsed', collapsed);
+
+        // Update the sashes for the active `horizontal` container when the container is collapsed/expanded
+        this.updateSashState(SashType.TopSash, this.node.previousElementSibling, collapsed);
+        this.updateSashState(SashType.BottomSash, this.node.nextElementSibling, collapsed);
+
         if (collapsed && this.wrapped.node.contains(document.activeElement)) {
             this.header.focus();
         }
@@ -1230,6 +1240,26 @@ export class ViewContainerPart extends BaseWidget {
         }
     }
 
+    protected updateSashState(sashType: SashType, sashElement: Element | null, activeContainerCollapsed: boolean): void {
+        if (sashElement && sashElement.className.includes('p-SplitPanel-handle')) {
+            // Hide the sash when the active `horizontal` container in the left panel is collapsed
+            sashElement.classList.toggle('sash-hidden', activeContainerCollapsed);
+
+            let adjacentContainer: Element | null;
+            if (sashType === SashType.TopSash) {
+                adjacentContainer = sashElement.previousElementSibling;
+            } else {
+                adjacentContainer = sashElement.nextElementSibling;
+            }
+
+            // Sash should only appear when the following two conditions are met:
+            //    1.  the active `horizontal` container is expanded
+            //    2.  the container that is above/below the active `horizontal` container is also expanded
+            if (!activeContainerCollapsed && adjacentContainer) {
+                sashElement.classList.toggle('sash-hidden', adjacentContainer.className.includes('collapsed'));
+            }
+        }
+    }
 }
 
 export namespace ViewContainerPart {

package/src/common/lsp-types.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { Range } from 'vscode-languageserver-types';
+import { Range } from 'vscode-languageserver-protocol';
 
 export interface TextDocumentContentChangeDelta {
     readonly range: Range;

package/src/common/severity.ts

@@ -19,7 +19,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DiagnosticSeverity } from 'vscode-languageserver-types';
+import { DiagnosticSeverity } from 'vscode-languageserver-protocol';
 
 export enum Severity {
     Ignore = 0,

package/src/electron-browser/window/electron-window-service.ts

@@ -68,7 +68,7 @@ export class ElectronWindowService extends DefaultWindowService {
     /**
      * Run when ElectronMain detects a `close` event and emits a `close-requested` event.
      * Should send an event to `electron.ipcRenderer` on the event's `confirmChannel` if it is safe to exit
-     * after running FrontentApplication `onWillStop` handlers or on the `cancelChannel` if it is not safe to exit.
+     * after running FrontendApplication `onWillStop` handlers or on the `cancelChannel` if it is not safe to exit.
      */
     protected async handleCloseRequestedEvent(event: CloseRequestArguments): Promise<void> {
         const safeToClose = await this.isSafeToShutDown();

package/shared/vscode-languageserver-types.d.ts

@@ -1 +0,0 @@
-export * from 'vscode-languageserver-types';

package/shared/vscode-languageserver-types.js

@@ -1 +0,0 @@
-module.exports = require('vscode-languageserver-types');