@theia/search-in-workspace 1.39.0-next.9 → 1.40.0

package/src/browser/search-in-workspace-result-tree-widget.tsx

@@ -11,7 +11,7 @@
 // with the GNU Classpath Exception which is available at
 // https://www.gnu.org/software/classpath/license.html.
 //
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
@@ -33,7 +33,7 @@ import {
     codicon,
     TopDownTreeIterator
 } from '@theia/core/lib/browser';
-import { CancellationTokenSource, Emitter, Event, isWindows, ProgressService } from '@theia/core';
+import { CancellationTokenSource, Emitter, EOL, Event, ProgressService } from '@theia/core';
 import {
     EditorManager, EditorDecoration, TrackedRangeStickiness, OverviewRulerLane,
     EditorWidget, EditorOpenerOptions, FindMatch
@@ -718,6 +718,10 @@ export class SearchInWorkspaceResultTreeWidget extends TreeWidget {
         };
     }
 
+    protected override getDepthPadding(depth: number): number {
+        return super.getDepthPadding(depth) + 5;
+    }
+
     protected override renderCaption(node: TreeNode, props: NodeProps): React.ReactNode {
         if (SearchInWorkspaceRootFolderNode.is(node)) {
             return this.renderRootFolderNode(node);
@@ -1210,7 +1214,7 @@ export class SearchInWorkspaceResultTreeWidget extends TreeWidget {
                 strings.push(string);
             }
         }
-        return strings.join(isWindows ? '\r\n' : '\n');
+        return strings.join(EOL);
     }
 }
 

package/src/browser/search-in-workspace-service.ts

@@ -11,7 +11,7 @@
 // with the GNU Classpath Exception which is available at
 // https://www.gnu.org/software/classpath/license.html.
 //
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';

package/src/browser/search-in-workspace-widget.tsx

@@ -11,7 +11,7 @@
 // with the GNU Classpath Exception which is available at
 // https://www.gnu.org/software/classpath/license.html.
 //
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import { Widget, Message, BaseWidget, Key, StatefulWidget, MessageLoop, KeyCode, codicon } from '@theia/core/lib/browser';
@@ -563,7 +563,7 @@ export class SearchInWorkspaceWidget extends BaseWidget implements StatefulWidge
 
     protected renderOptionElement(opt: SearchFieldState): React.ReactNode {
         return <span
-            className={`${opt.className} option ${opt.enabled ? 'enabled' : ''}`}
+            className={`${opt.className} option action-label ${opt.enabled ? 'enabled' : ''}`}
             title={opt.title}
             onClick={() => this.handleOptionClick(opt)}></span>;
     }

package/src/browser/search-layout-migrations.ts

@@ -11,7 +11,7 @@
 // with the GNU Classpath Exception which is available at
 // https://www.gnu.org/software/classpath/license.html.
 //
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import { injectable } from '@theia/core/shared/inversify';

package/src/browser/styles/index.css

@@ -11,361 +11,371 @@
  * with the GNU Classpath Exception which is available at
  * https://www.gnu.org/software/classpath/license.html.
  *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
  ********************************************************************************/
 
 #search-in-workspace {
-    height: 100%;
+  height: 100%;
 }
 
 #search-in-workspace .theia-TreeContainer.empty {
-    overflow: hidden;
+  overflow: hidden;
 }
 
 .t-siw-search-container {
-    padding: 5px ;
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    box-sizing: border-box;
+  padding: 0px 1px;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  box-sizing: border-box;
 }
 
 .t-siw-search-container .theia-ExpansionToggle {
-    padding-right: 4px;
-    min-width: 6px;
+  padding-right: 4px;
+  min-width: 6px;
 }
 
 .t-siw-search-container .theia-input {
-    flex: 1;
-    line-height: var(--theia-content-line-height);
-    padding: 3px 0 3px 4px;
+  flex: 1;
+  line-height: var(--theia-content-line-height);
+  padding: 3px 0 3px 4px;
 }
 
 .t-siw-search-container #search-input-field:focus {
-    border: none;
-    outline: none;
+  border: none;
+  outline: none;
 }
 
 .t-siw-search-container #search-input-field {
-    background: none;
-    border: none;
+  background: none;
+  border: none;
 }
 
 .t-siw-search-container .searchHeader {
-    width: 100%;
-    margin-bottom:  10px;
+  padding: 5px 5px 15px 2px;
 }
 
 .t-siw-search-container .searchHeader .controls.button-container {
-    height: var(--theia-content-line-height);
-    margin-bottom: 5px;
+  height: var(--theia-content-line-height);
+  margin-bottom: 5px;
 }
 
 .t-siw-search-container .searchHeader .search-field-container {
-    background: var(--theia-input-background);
-    border-style: solid;
-    border-width: var(--theia-border-width);
-    border-color: var(--theia-input-background);
+  background: var(--theia-input-background);
+  border-style: solid;
+  border-width: var(--theia-border-width);
+  border-color: var(--theia-input-background);
+  border-radius: 2px;
 }
 
 .t-siw-search-container .searchHeader .search-field-container.focused {
-    border-color: var(--theia-focusBorder);
+  border-color: var(--theia-focusBorder);
 }
 
 .t-siw-search-container .searchHeader .search-field {
-    display: flex;
-    align-items:  center;
+  display: flex;
+  align-items: center;
 }
 
 .t-siw-search-container .searchHeader .search-field:focus {
-    border: none;
-    outline: none;
+  border: none;
+  outline: none;
 }
 
 .t-siw-search-container .searchHeader .search-field .option {
-    opacity: 0.7;
-    cursor: pointer;
+  opacity: 0.7;
+  cursor: pointer;
 }
 
 .t-siw-search-container .searchHeader .search-field .option.enabled {
-    border: var(--theia-border-width) var(--theia-inputOption-activeBorder) solid;
-    background-color: var(--theia-inputOption-activeBackground);
+  color: var(--theia-inputOption-activeForeground);
+  border: var(--theia-border-width) var(--theia-inputOption-activeBorder) solid;
+  background-color: var(--theia-inputOption-activeBackground);
+  opacity: 1;
 }
 
 .t-siw-search-container .searchHeader .search-field .option:hover {
-    opacity: 1;
+  opacity: 1;
 }
 
 .t-siw-search-container .searchHeader .search-field .option-buttons {
-    height: 23px;
-    display: flex;
-    align-items:  center;
-    background-color: none;
+  height: 23px;
+  display: flex;
+  align-items: center;
+  background-color: none;
 }
 
 .t-siw-search-container .searchHeader .search-field-container.tooManyResults {
-    border-style: solid;
-    border-width: var(--theia-border-width);
-    margin: -1px;
-    border-color: var(--theia-inputValidation-warningBorder);
+  border-style: solid;
+  border-width: var(--theia-border-width);
+  margin: -1px;
+  border-color: var(--theia-inputValidation-warningBorder);
 }
 
-.t-siw-search-container .searchHeader .search-field-container .search-notification {
-    height: 0;
-    display: none;
-    width: 100%;
-    position: relative;
+.t-siw-search-container
+  .searchHeader
+  .search-field-container
+  .search-notification {
+  height: 0;
+  display: none;
+  width: 100%;
+  position: relative;
 }
 
-.t-siw-search-container .searchHeader .search-field-container.focused .search-notification.show {
-    display: block;
+.t-siw-search-container
+  .searchHeader
+  .search-field-container.focused
+  .search-notification.show {
+  display: block;
 }
 
-.t-siw-search-container .searchHeader .search-notification div{
-    background-color: var(--theia-inputValidation-warningBackground);
-    width: calc(100% + 2px);
-    margin-left: -1px;
-    color: var(--theia-inputValidation-warningForeground);
-    z-index: 1000;
-    position: absolute;
-    border: 1px solid var(--theia-inputValidation-warningBorder);
-    box-sizing: border-box;
-    padding: 3px;
+.t-siw-search-container .searchHeader .search-notification div {
+  background-color: var(--theia-inputValidation-warningBackground);
+  width: calc(100% + 2px);
+  margin-left: -1px;
+  color: var(--theia-inputValidation-warningForeground);
+  z-index: 1000;
+  position: absolute;
+  border: 1px solid var(--theia-inputValidation-warningBorder);
+  box-sizing: border-box;
+  padding: 3px;
 }
 
 .t-siw-search-container .searchHeader .button-container {
-    text-align: center;
-    display: flex;
-    justify-content: center;
+  text-align: center;
+  display: flex;
+  justify-content: center;
 }
 
 .t-siw-search-container .searchHeader .search-field .option,
 .t-siw-search-container .searchHeader .button-container .btn {
-    width: 21px;
-    height: 21px;
-    margin: 0 1px;
-    display: inline-block;
-    box-sizing: border-box;
-    align-items: center;
-    user-select: none;
-    background-repeat: no-repeat;
-    background-position: center;
-    border: var(--theia-border-width) solid transparent;
+  width: 21px;
+  height: 21px;
+  margin: 0 1px;
+  display: inline-block;
+  box-sizing: border-box;
+  align-items: center;
+  user-select: none;
+  background-repeat: no-repeat;
+  background-position: center;
+  border: var(--theia-border-width) solid transparent;
 }
 
 .t-siw-search-container .searchHeader .search-field .fa.option {
-    display: flex;
-    align-items: center;
-    justify-content: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
 .t-siw-search-container .searchHeader .search-details {
-    position: relative;
-    padding-top: 5px;
+  position: relative;
+  padding-top: 5px;
 }
 
 .t-siw-search-container .searchHeader .search-details .button-container {
-    position: absolute;
-    width: 25px;
-    top:0;
-    right:0;
-    cursor: pointer;
+  position: absolute;
+  width: 25px;
+  top: 0;
+  right: 0;
+  cursor: pointer;
 }
 
 .t-siw-search-container .searchHeader .glob-field-container.hidden {
-    display: none;
+  display: none;
 }
 
 .t-siw-search-container .searchHeader .glob-field-container .glob-field {
-    margin-bottom: 8px;
-    margin-left: 18px;
-    display: flex;
-    flex-direction: column;
+  margin-bottom: 8px;
+  margin-left: 18px;
+  display: flex;
+  flex-direction: column;
 }
 
 .t-siw-search-container .searchHeader .glob-field-container .glob-field .label {
-    margin-bottom: 3px;
-    user-select: none;
-    font-size: var(--theia-ui-font-size0);
+  margin-bottom: 3px;
+  user-select: none;
+  font-size: var(--theia-ui-font-size0);
 }
 
-.t-siw-search-container .searchHeader .glob-field-container .glob-field .theia-input:not(:focus)::placeholder {
-    color: transparent;
+.t-siw-search-container
+  .searchHeader
+  .glob-field-container
+  .glob-field
+  .theia-input:not(:focus)::placeholder {
+  color: transparent;
 }
 
 .t-siw-search-container .resultContainer {
-    height: 100%;
-    margin-left: 13px;
+  height: 100%;
 }
 
 .t-siw-search-container .result {
-    overflow: hidden;
-    width: 100%;
-    flex: 1;
+  overflow: hidden;
+  width: 100%;
+  flex: 1;
 }
 
 .t-siw-search-container .result .result-head {
-    display:flex;
+  display: flex;
 }
 
 .t-siw-search-container .result .result-head .fa,
 .t-siw-search-container .result .result-head .theia-file-icons-js {
-    margin: 0 3px;
+  margin: 0 3px;
 }
 
 .t-siw-search-container .result .result-head .file-name {
-    margin-right: 5px;
+  margin-right: 5px;
 }
 
 .t-siw-search-container .result .result-head .file-path {
-    font-size: var(--theia-ui-font-size0);
-    margin-left: 3px;
+  font-size: var(--theia-ui-font-size0);
+  margin-left: 3px;
 }
 
 .t-siw-search-container .resultLine .match {
-    line-height: normal;
-    white-space: pre;
-    background: var(--theia-editor-findMatchHighlightBackground);
-    border: 1px solid var(--theia-editor-findMatchHighlightBorder);
+  line-height: normal;
+  white-space: pre;
+  background: var(--theia-editor-findMatchHighlightBackground);
+  border: 1px solid var(--theia-editor-findMatchHighlightBorder);
 }
 .theia-hc .t-siw-search-container .resultLine .match {
-    border-style: dashed;
+  border-style: dashed;
 }
 
 .t-siw-search-container .resultLine .match.strike-through {
-    text-decoration: line-through;
-    background: var(--theia-diffEditor-removedTextBackground);
-    border-color: var(--theia-diffEditor-removedTextBorder);
+  text-decoration: line-through;
+  background: var(--theia-diffEditor-removedTextBackground);
+  border-color: var(--theia-diffEditor-removedTextBorder);
 }
 
 .t-siw-search-container .resultLine .replace-term {
-    background: var(--theia-diffEditor-insertedTextBackground);
-    border: 1px solid var(--theia-diffEditor-insertedTextBorder);
+  background: var(--theia-diffEditor-insertedTextBackground);
+  border: 1px solid var(--theia-diffEditor-insertedTextBorder);
 }
-.theia-hc
-.t-siw-search-container .resultLine .replace-term {
-    border-style: dashed;
+.theia-hc .t-siw-search-container .resultLine .replace-term {
+  border-style: dashed;
 }
 
 .t-siw-search-container .noWrapInfo {
-    width: 100%;
+  width: 100%;
 }
 
 .t-siw-search-container .result-head-info {
-    display: inline-flex;
-    align-items: center;
+  display: inline-flex;
+  align-items: center;
 }
 
 .search-in-workspace-editor-match {
-    background: var(--theia-editor-findMatchHighlightBackground);
+  background: var(--theia-editor-findMatchHighlightBackground);
 }
 
 .current-search-in-workspace-editor-match {
-    background: var(--theia-editor-findMatchBackground)
+  background: var(--theia-editor-findMatchBackground);
 }
 
 .current-match-range-highlight {
-    background: var(--theia-editor-findRangeHighlightBackground);
+  background: var(--theia-editor-findRangeHighlightBackground);
 }
 
 .result-node-buttons {
-    display: none;
+  display: none;
 }
 
 .theia-TreeNode:hover .result-node-buttons {
-    display: flex;
-    justify-content: flex-end;
-    align-items: center;
-    align-self: center;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  align-self: center;
 }
 
 .theia-TreeNode:hover .result-head .notification-count-container {
-    display: none;
+  display: none;
 }
 
 .result-node-buttons > span {
-    width: 15px;
-    height: 15px;
-    margin-left: 2.5px;
-    margin-right: 0.5px;
-    background-repeat:  no-repeat;
-    background-position: center;
-    background-size: contain;
+  width: 15px;
+  height: 15px;
+  margin-left: 2.5px;
+  margin-right: 0.5px;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: contain;
 }
 
 .search-and-replace-container {
-    display: flex;
+  display: flex;
 }
 
 .replace-toggle {
-    display: flex;
-    align-items:  center;
-    width: 16px;
-    min-width: 16px;
-    justify-content: center;
-    margin-right: 2px;
-    box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  width: 16px;
+  min-width: 16px;
+  justify-content: center;
+  margin-right: 2px;
+  box-sizing: border-box;
 }
 
 .theia-side-panel .replace-toggle {
-    width: 16px;
-    min-width: 16px;
+  width: 16px;
+  min-width: 16px;
 }
 
 .theia-side-panel .replace-toggle .codicon {
-    padding: 0px;
+  padding: 0px;
 }
 
 .replace-toggle:hover {
-    background: rgba(50%, 50%, 50%, 0.2);
+  background: rgba(50%, 50%, 50%, 0.2);
 }
 
 .search-and-replace-fields {
-    display: flex;
-    flex-direction: column;
-    flex: 1;
+  display: flex;
+  flex-direction: column;
+  flex: 1;
 }
 
 .replace-field {
-    display: flex;
-    margin-top: 5px;
+  display: flex;
+  margin-top: 5px;
 }
 
 .replace-field.hidden {
-    display: none;
+  display: none;
 }
 
 .replace-all-button-container {
-    width: 25px;
-    display: flex;
-    align-items: center;
-    justify-content:  center;
+  width: 25px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
 .result-node-buttons .replace-result {
-    background-image: var(--theia-icon-replace);
+  background-image: var(--theia-icon-replace);
 }
 .result-node-buttons .replace-all-result {
-    background-image: var(--theia-icon-replace-all);
+  background-image: var(--theia-icon-replace-all);
 }
 
 .replace-all-button-container .action-label.disabled {
-    opacity: var(--theia-mod-disabled-opacity);
-    background: transparent;
-    cursor: default;
+  opacity: var(--theia-mod-disabled-opacity);
+  background: transparent;
+  cursor: default;
 }
 
 .highlighted-count-container {
-    background-color: var(--theia-list-activeSelectionBackground);
-    color: var(--theia-list-activeSelectionForeground);
+  background-color: var(--theia-list-activeSelectionBackground);
+  color: var(--theia-list-activeSelectionForeground);
 }
 
 .t-siw-search-container .searchHeader .search-info {
-    color: var(--theia-descriptionForeground);
-    margin-left: 17px;
+  color: var(--theia-descriptionForeground);
+  margin-left: 17px;
 }
 
 .theia-siw-lineNumber {
-    opacity: .7;
-    padding-right: 4px;
+  opacity: 0.7;
+  padding-right: 4px;
 }

package/src/common/search-in-workspace-interface.ts

@@ -11,10 +11,10 @@
 // with the GNU Classpath Exception which is available at
 // https://www.gnu.org/software/classpath/license.html.
 //
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { JsonRpcServer } from '@theia/core';
+import { RpcServer } from '@theia/core';
 
 export interface SearchInWorkspaceOptions {
     /**
@@ -134,7 +134,7 @@ export interface SearchInWorkspaceClient {
 
 export const SIW_WS_PATH = '/services/search-in-workspace';
 export const SearchInWorkspaceServer = Symbol('SearchInWorkspaceServer');
-export interface SearchInWorkspaceServer extends JsonRpcServer<SearchInWorkspaceClient> {
+export interface SearchInWorkspaceServer extends RpcServer<SearchInWorkspaceClient> {
     /**
      * Start a search for WHAT in directories ROOTURIS. Return a unique search id.
      */

package/src/node/ripgrep-search-in-workspace-server.slow-spec.ts

@@ -11,7 +11,7 @@
 // with the GNU Classpath Exception which is available at
 // https://www.gnu.org/software/classpath/license.html.
 //
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import { Container } from '@theia/core/shared/inversify';

package/src/node/ripgrep-search-in-workspace-server.ts

@@ -11,7 +11,7 @@
 // with the GNU Classpath Exception which is available at
 // https://www.gnu.org/software/classpath/license.html.
 //
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
 import * as fs from '@theia/core/shared/fs-extra';