Changes to length === 0 for better safety

src/commands/diffWith.ts

@@ -135,7 +135,7 @@ export class DiffWithCommand extends ActiveEditorCommand {
                 if (GitService.isUncommitted(args.rhs.sha)) {
                     rhsSuffix = 'deleted';
                 }
-                else if (rhsSuffix === '' && args.rhs.sha === GitService.deletedOrMissingSha) {
+                else if (rhsSuffix.length === 0 && args.rhs.sha === GitService.deletedOrMissingSha) {
                     rhsSuffix = 'not in Working Tree';
                 }
                 else {
@@ -147,7 +147,7 @@ export class DiffWithCommand extends ActiveEditorCommand {
             }
 
             let lhsSuffix = args.lhs.sha !== GitService.deletedOrMissingSha ? GitService.shortenSha(lhsSha) || '' : '';
-            if (lhs === undefined && args.rhs.sha === '') {
+            if (lhs === undefined && args.rhs.sha.length === 0) {
                 if (rhs !== undefined) {
                     lhsSuffix = `not in ${lhsSuffix}`;
                     rhsSuffix = '';
@@ -157,7 +157,7 @@ export class DiffWithCommand extends ActiveEditorCommand {
                 }
             }
 
-            if (args.lhs.title === undefined && (lhs !== undefined || lhsSuffix !== '')) {
+            if (args.lhs.title === undefined && (lhs !== undefined || lhsSuffix.length !== 0)) {
                 args.lhs.title = `${paths.basename(args.lhs.uri.fsPath)}${lhsSuffix ? ` (${lhsSuffix})` : ''}`;
             }
             if (args.rhs.title === undefined) {

src/git/formatters/formatter.ts

@@ -41,7 +41,7 @@ export abstract class Formatter<TItem = any, TOptions extends IFormatOptions = I
     private collapsableWhitespace: number = 0;
 
     protected _padOrTruncate(s: string, options: Strings.ITokenOptions | undefined) {
-        if (s === '') return s;
+        if (s == null || s.length === 0) return s;
 
         // NOTE: the collapsable whitespace logic relies on the javascript template evaluation to be left to right
         if (options === undefined) {

src/git/fsProvider.ts

@@ -71,7 +71,7 @@ export class GitFileSystemProvider implements FileSystemProvider, Disposable {
 
         const items = [
             ...Iterables.map<GitTree, [string, FileType]>(tree, t => [
-                path !== '' ? Strings.normalizePath(paths.relative(path, t.path)) : t.path,
+                path != null && path.length !== 0 ? Strings.normalizePath(paths.relative(path, t.path)) : t.path,
                 typeToFileType(t.type)
             ])
         ];

src/git/git.ts

@@ -262,7 +262,7 @@ export class Git {
     ) {
         strings = { stagedUncommitted: 'Index', uncommitted: 'Working Tree', working: '', ...strings };
 
-        if (ref === '') return strings.working;
+        if (ref == null || ref.length === 0) return strings.working;
         if (Git.isUncommitted(ref)) {
             if (Git.isStagedUncommitted(ref)) return strings.stagedUncommitted;
 
@@ -463,7 +463,7 @@ export class Git {
             '--get',
             key
         );
-        return data === '' ? undefined : data.trim();
+        return data.length === 0 ? undefined : data.trim();
     }
 
     static async config_getRegex(pattern: string, repoPath?: string, options: { local?: boolean } = {}) {
@@ -473,7 +473,7 @@ export class Git {
             '--get-regex',
             pattern
         );
-        return data === '' ? undefined : data.trim();
+        return data.length === 0 ? undefined : data.trim();
     }
 
     static diff(repoPath: string, fileName: string, ref1?: string, ref2?: string, options: { encoding?: string } = {}) {
@@ -626,7 +626,7 @@ export class Git {
             '--',
             fileName
         );
-        return data === '' ? undefined : data.trim();
+        return data.length === 0 ? undefined : data.trim();
     }
 
     static async log_resolve(repoPath: string, fileName: string, ref: string) {
@@ -640,7 +640,7 @@ export class Git {
             '--',
             fileName
         );
-        return data === '' ? undefined : data.trim();
+        return data.length === 0 ? undefined : data.trim();
     }
 
     static log_search(repoPath: string, search: string[] = emptyArray, options: { maxCount?: number } = {}) {
@@ -671,7 +671,7 @@ export class Git {
         }
 
         const data = await git<string>({ cwd: repoPath, errors: GitErrorHandling.Ignore }, ...params, '--', fileName);
-        return data === '' ? undefined : data.trim();
+        return data.length === 0 ? undefined : data.trim();
     }
 
     static async ls_tree(repoPath: string, ref: string, options: { fileName?: string } = {}) {
@@ -683,7 +683,7 @@ export class Git {
             params.push('-lrt', ref, '--');
         }
         const data = await git<string>({ cwd: repoPath, errors: GitErrorHandling.Ignore }, ...params);
-        return data === '' ? undefined : data.trim();
+        return data.length === 0 ? undefined : data.trim();
     }
 
     static merge_base(repoPath: string, ref1: string, ref2: string, options: { forkPoint?: boolean } = {}) {
@@ -709,7 +709,7 @@ export class Git {
 
     static async revparse(repoPath: string, ref: string): Promise<string | undefined> {
         const data = await git<string>({ cwd: repoPath, errors: GitErrorHandling.Ignore }, 'rev-parse', ref);
-        return data === '' ? undefined : data.trim();
+        return data.length === 0 ? undefined : data.trim();
     }
 
     static async revparse_currentBranch(repoPath: string): Promise<[string, string | undefined] | undefined> {
@@ -734,7 +734,7 @@ export class Git {
                     '--format=%H',
                     '--'
                 );
-                if (data === '') return undefined;
+                if (data.length === 0) return undefined;
 
                 // Matches output of `git branch -vv`
                 const sha = data.trim();
@@ -752,7 +752,7 @@ export class Git {
                     '--short',
                     'HEAD'
                 );
-                return data === '' ? undefined : [data.trim(), undefined];
+                return data.length === 0 ? undefined : [data.trim(), undefined];
             }
 
             defaultExceptionHandler(ex, opts, ...params);
@@ -762,7 +762,7 @@ export class Git {
 
     static async revparse_toplevel(cwd: string): Promise<string | undefined> {
         const data = await git<string>({ cwd: cwd, errors: GitErrorHandling.Ignore }, 'rev-parse', '--show-toplevel');
-        return data === '' ? undefined : data.trim();
+        return data.length === 0 ? undefined : data.trim();
     }
 
     static async show<TOut extends string | Buffer>(

src/git/gitService.ts

@@ -1081,7 +1081,7 @@ export class GitService implements Disposable {
 
         const data = await Git.branch(repoPath, { all: true });
         // If we don't get any data, assume the repo doesn't have any commits yet so check if we have a current branch
-        if (data === '') {
+        if (data == null || data.length === 0) {
             const current = await this.getBranch(repoPath);
             branches = current !== undefined ? [current] : [];
         }
@@ -2176,7 +2176,7 @@ export class GitService implements Disposable {
 
         strings = { deletedOrMissing: '(deleted)', working: '', ...strings };
 
-        if (ref === '') return strings.working;
+        if (ref == null || ref.length === 0) return strings.working;
         if (ref === GitService.deletedOrMissingSha) return strings.deletedOrMissing;
 
         return Git.isShaLike(ref) || Git.isStagedUncommitted(ref) ? Git.shortenSha(ref, strings) : ref;

src/git/models/branch.ts

@@ -38,7 +38,7 @@ export class GitBranch {
             this.name = name;
         }
 
-        this.tracking = tracking === '' || tracking == null ? undefined : tracking;
+        this.tracking = tracking == null || tracking.length === 0 ? undefined : tracking;
         this.state = {
             ahead: ahead,
             behind: behind

src/git/models/logCommit.ts

@@ -116,10 +116,10 @@ export class GitLogCommit extends GitCommit {
                 status += `${Strings.pluralize('file', added)} added`;
             }
             if (changed) {
-                status += `${status === '' ? '' : separator}${Strings.pluralize('file', changed)} changed`;
+                status += `${status.length === 0 ? '' : separator}${Strings.pluralize('file', changed)} changed`;
             }
             if (deleted) {
-                status += `${status === '' ? '' : separator}${Strings.pluralize('file', deleted)} deleted`;
+                status += `${status.length === 0 ? '' : separator}${Strings.pluralize('file', deleted)} deleted`;
             }
             return `${prefix}${status}${suffix}`;
         }

src/git/models/status.ts

@@ -87,10 +87,10 @@ export class GitStatus {
                 status += `${Strings.pluralize('file', added)} added`;
             }
             if (changed) {
-                status += `${status === '' ? '' : separator}${Strings.pluralize('file', changed)} changed`;
+                status += `${status.length === 0 ? '' : separator}${Strings.pluralize('file', changed)} changed`;
             }
             if (deleted) {
-                status += `${status === '' ? '' : separator}${Strings.pluralize('file', deleted)} deleted`;
+                status += `${status.length === 0 ? '' : separator}${Strings.pluralize('file', deleted)} deleted`;
             }
             return `${prefix}${status}${suffix}`;
         }
@@ -124,7 +124,7 @@ export class GitStatus {
                 status += `${Strings.pluralize('commit', state.behind)} behind`;
             }
             if (state.ahead) {
-                status += `${status === '' ? '' : separator}${Strings.pluralize('commit', state.ahead)} ahead`;
+                status += `${status.length === 0 ? '' : separator}${Strings.pluralize('commit', state.ahead)} ahead`;
             }
             return `${prefix}${status}${suffix}`;
         }

src/git/parsers/statusParser.ts

@@ -124,14 +124,14 @@ export class GitStatusParser {
         originalFileName?: string
     ): GitStatusFile {
         let indexStatus = rawStatus[0] !== '.' ? rawStatus[0].trim() : undefined;
-        if (indexStatus === '' || indexStatus === null) {
+        if (indexStatus == null || indexStatus.length === 0) {
             indexStatus = undefined;
         }
 
         let workTreeStatus = undefined;
         if (rawStatus.length > 1) {
             workTreeStatus = rawStatus[1] !== '.' ? rawStatus[1].trim() : undefined;
-            if (workTreeStatus === '' || workTreeStatus === null) {
+            if (workTreeStatus == null || workTreeStatus.length === 0) {
                 workTreeStatus = undefined;
             }
         }

src/system/string.ts

@@ -84,7 +84,7 @@ export namespace Strings {
         fileName: string,
         options: { addLeadingSlash?: boolean; stripTrailingSlash?: boolean } = { stripTrailingSlash: true }
     ) {
-        if (fileName == null || fileName === '') return fileName;
+        if (fileName == null || fileName.length === 0) return fileName;
 
         let normalized = fileName.replace(pathNormalizeRegex, '/');
 

src/ui/shared/app-base.ts

@@ -64,7 +64,7 @@ export abstract class App<TBootstrap extends Bootstrap> {
         }
 
         let value: string | null | undefined = element.value;
-        if (value === '') {
+        if (value == null || value.length === 0) {
             value = element.dataset.defaultValue;
             if (value === undefined) {
                 value = null;
@@ -262,7 +262,7 @@ export abstract class App<TBootstrap extends Bootstrap> {
                     if (value === undefined) {
                         value = this.getSettingValue<string | boolean>(lhs) || false;
                     }
-                    state = rhs !== undefined ? rhs === '' + value : Boolean(value);
+                    state = rhs !== undefined ? rhs === String(value) : Boolean(value);
                     break;
                 }
                 case '!': {
@@ -271,7 +271,7 @@ export abstract class App<TBootstrap extends Bootstrap> {
                     if (value === undefined) {
                         value = this.getSettingValue<string | boolean>(lhs) || false;
                     }
-                    state = rhs !== undefined ? rhs !== '' + value : !value;
+                    state = rhs !== undefined ? rhs !== String(value) : !value;
                     break;
                 }
                 case '+': {

src/views/viewCommands.ts

@@ -474,7 +474,7 @@ export class ViewCommands implements Disposable {
             placeHolder: `Branch name`,
             value: value
         } as InputBoxOptions);
-        if (name === undefined || name === '') return;
+        if (name === undefined || name.length === 0) return;
 
         this.sendTerminalCommand('branch', `${remoteBranch ? '-t ' : ''}${name} ${node.ref}`, node.repoPath);
     }
@@ -571,15 +571,15 @@ export class ViewCommands implements Disposable {
             prompt: `Please provide a tag name (Press 'Enter' to confirm or 'Escape' to cancel)`,
             placeHolder: `Tag name`
         } as InputBoxOptions);
-        if (name === undefined || name === '') return;
+        if (name === undefined || name.length === 0) return;
 
         const message = await window.showInputBox({
             prompt: `Please provide an optional message to annotate the tag (Press 'Enter' to confirm or 'Escape' to cancel)`,
             placeHolder: `Tag message`
         } as InputBoxOptions);
         if (message === undefined) return;
 
-        const args = `${message !== '' ? `-a -m "${message}" ` : ''}${name} ${node.ref}`;
+        const args = `${message.length !== 0 ? `-a -m "${message}" ` : ''}${name} ${node.ref}`;
         this.sendTerminalCommand('tag', args, node.repoPath);
     }