Feature/add search icon commandline

browser/src/Services/Configuration/DefaultConfiguration.ts

@@ -34,6 +34,7 @@ const BaseConfiguration: IConfigurationValues = {
 
     "experimental.editor.textMateHighlighting.enabled": false,
     "experimental.commandline.mode": false,
+    "experimental.commandline.icons": false,
     "experimental.wildmenu.mode": false,
 
     "experimental.neovim.transport": "stdio",

browser/src/Services/Configuration/IConfigurationValues.ts

@@ -47,6 +47,8 @@ export interface IConfigurationValues {
     // The transport to use for Neovim
     // Valid values are "stdio" and "pipe"
     "experimental.neovim.transport": string
+    "experimental.commandline.mode": boolean,
+    "experimental.commandline.icons": boolean,
 
     "autoClosingPairs.enabled": boolean
     "autoClosingPairs.default": any

browser/src/UI/components/CommandLine.tsx

@@ -2,6 +2,7 @@ import * as React from "react"
 import { connect } from "react-redux"
 import styled from "styled-components"
 
+import { Icon } from "./../../UI/Icon"
 import { fadeInAndDown } from "./animations"
 import { boxShadow } from "./common"
 
@@ -41,7 +42,17 @@ const Cursor = styled.span`
     height: 1.3em;
 `
 
+const IconContainer = styled.span`
+    margin-right: 0.5em;
+`
+
+const ArrowContainer = styled.span`
+    font-size: 0.7em;
+    margin-right: 0.6em;
+`
+
 export interface ICommandLineRendererProps {
+    showIcons: boolean
     visible: boolean
     content: string
     position: number
@@ -55,6 +66,18 @@ interface State {
     waiting: boolean
 }
 
+const CommandLineIcon = (props: { iconName: string; arrow?: boolean }) => (
+    <span>
+        {!props.arrow ? (
+            <Icon name={props.iconName} />
+        ) : (
+            <ArrowContainer>
+                <Icon name={props.iconName} />
+            </ArrowContainer>
+        )}
+    </span>
+)
+
 class CommandLine extends React.PureComponent<ICommandLineRendererProps, State> {
     public state = {
         focused: false,
@@ -76,12 +99,42 @@ class CommandLine extends React.PureComponent<ICommandLineRendererProps, State>
         }
     }
 
+    public renderIconOrChar(character: string) {
+        if (!this.props.showIcons) {
+            return character
+        }
+        switch (character) {
+            case "/":
+                return [
+                    <CommandLineIcon iconName="search" key={`${character}-search`} />,
+                    <CommandLineIcon
+                        arrow
+                        iconName="arrow-right"
+                        key={`${character}-arrow-right`}
+                    />,
+                ]
+            case ":":
+                return (
+                    <IconContainer>
+                        <CommandLineIcon iconName="file-code-o" />
+                    </IconContainer>
+                )
+            case "?":
+                return [
+                    <CommandLineIcon iconName="search" key={`${character}-search`} />,
+                    <CommandLineIcon key={`${character}-arrow-left`} arrow iconName="arrow-left" />,
+                ]
+            default:
+                return character
+        }
+    }
+
     public componentWillUnmount() {
         clearTimeout(this.timer)
     }
 
     public render(): null | JSX.Element {
-        const { visible, content, position } = this.props
+        const { visible, content, position, firstchar } = this.props
         const { focused, waiting } = this.state
         if (!focused && visible && this._inputElement) {
             this._inputElement.focus()
@@ -96,7 +149,7 @@ class CommandLine extends React.PureComponent<ICommandLineRendererProps, State>
             visible && (
                 <CommandLineBox>
                     <CommandLineOutput innerRef={e => (this._inputElement = e)}>
-                        {this.props.firstchar}
+                        {this.renderIconOrChar(firstchar)}
                         {this.props.prompt}
                         {beginning}
                         <Cursor />
@@ -108,15 +161,17 @@ class CommandLine extends React.PureComponent<ICommandLineRendererProps, State>
     }
 }
 
-const mapStateToProps = ({
-    commandLine: { visible, position, content, firstchar, level, prompt },
-}: State.IState) => ({
-    visible,
-    content,
-    firstchar,
-    position,
-    level,
-    prompt,
-})
+const mapStateToProps = ({ commandLine, configuration }: State.IState) => {
+    const { visible, position, content, firstchar, level, prompt } = commandLine
+    return {
+        showIcons: configuration["experimental.commandline.icons"],
+        visible,
+        content,
+        firstchar,
+        position,
+        level,
+        prompt,
+    }
+}
 
 export default connect<ICommandLineRendererProps>(mapStateToProps)(CommandLine)