From 0e9fde9386df671639f7d1bd19c197dfd9847efe Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Sun, 18 Oct 2020 01:50:41 -0400
Subject: [PATCH] Fixes webview import issues

---
 src/config.ts                      |  8 +++++++-
 src/logger.ts                      | 11 +++--------
 src/vsls/protocol.ts               |  2 +-
 src/webviews/apps/rebase/rebase.ts |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/config.ts b/src/config.ts
index e61ca24..e6bcfb8 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,5 +1,11 @@
 'use strict';
-import { TraceLevel } from './logger';
+
+export enum TraceLevel {
+	Silent = 'silent',
+	Errors = 'errors',
+	Verbose = 'verbose',
+	Debug = 'debug',
+}
 
 export interface Config {
 	autolinks: AutolinkReference[] | null;
diff --git a/src/logger.ts b/src/logger.ts
index 8bb0fc0..778dec5 100644
--- a/src/logger.ts
+++ b/src/logger.ts
@@ -1,19 +1,14 @@
 'use strict';
 import { ExtensionContext, ExtensionMode, OutputChannel, Uri, window } from 'vscode';
+import { TraceLevel } from './configuration';
 import { extensionOutputChannelName } from './constants';
 import { getCorrelationContext, getNextCorrelationId } from './system';
 
 const emptyStr = '';
-
-export enum TraceLevel {
-	Silent = 'silent',
-	Errors = 'errors',
-	Verbose = 'verbose',
-	Debug = 'debug',
-}
-
 const ConsolePrefix = `[${extensionOutputChannelName}]`;
 
+export { TraceLevel } from './configuration';
+
 export interface LogCorrelationContext {
 	readonly correlationId?: number;
 	readonly prefix: string;
diff --git a/src/vsls/protocol.ts b/src/vsls/protocol.ts
index eacba9b..0e3e764 100644
--- a/src/vsls/protocol.ts
+++ b/src/vsls/protocol.ts
@@ -1,5 +1,5 @@
 'use strict';
-import { GitCommandOptions } from '../git/git';
+import type { GitCommandOptions } from '../git/git';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export class RequestType<Request, Response> {
diff --git a/src/webviews/apps/rebase/rebase.ts b/src/webviews/apps/rebase/rebase.ts
index 0cbe8c5..777b23c 100644
--- a/src/webviews/apps/rebase/rebase.ts
+++ b/src/webviews/apps/rebase/rebase.ts
@@ -89,7 +89,7 @@ class RebaseEditor extends App<RebaseState> {
 				}
 
 				const ref = e.item.dataset.ref;
-				if (ref) {
+				if (ref != null) {
 					console.log(ref, e.newIndex, e.oldIndex);
 					this.moveEntry(ref, e.newIndex, false);