From 29dd2bd20de24e945bde135858c93a89881d352d Mon Sep 17 00:00:00 2001
From: Anton Kosiakov <anton.kosyakov@typefox.io>
Date: Fri, 7 Dec 2018 14:27:53 +0100
Subject: [PATCH] fix #3679: remove usages of Array.values

Signed-off-by: Anton Kosiakov <anton.kosyakov@typefox.io>
---
 examples/electron/package.json                               | 3 +++
 packages/debug/src/browser/console/debug-console-items.tsx   | 4 ++--
 packages/debug/src/browser/console/debug-console-session.ts  | 2 +-
 packages/debug/src/browser/editor/debug-hover-source.tsx     | 2 +-
 packages/debug/src/browser/view/debug-breakpoints-source.tsx | 2 +-
 packages/debug/src/browser/view/debug-variables-source.ts    | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/examples/electron/package.json b/examples/electron/package.json
index 2dc3a2df076b5..6114396a6a19c 100644
--- a/examples/electron/package.json
+++ b/examples/electron/package.json
@@ -19,6 +19,8 @@
     "@theia/console": "^0.3.17",
     "@theia/core": "^0.3.17",
     "@theia/cpp": "^0.3.17",
+    "@theia/debug": "^0.3.17",
+    "@theia/debug-nodejs": "^0.3.17",
     "@theia/editor": "^0.3.17",
     "@theia/editor-preview": "^0.3.17",
     "@theia/editorconfig": "^0.3.17",
@@ -28,6 +30,7 @@
     "@theia/getting-started": "^0.3.17",
     "@theia/git": "^0.3.17",
     "@theia/java": "^0.3.17",
+    "@theia/java-debug": "^0.3.17",
     "@theia/json": "^0.3.17",
     "@theia/keymaps": "^0.3.17",
     "@theia/languages": "^0.3.17",
diff --git a/packages/debug/src/browser/console/debug-console-items.tsx b/packages/debug/src/browser/console/debug-console-items.tsx
index 20df25bf05233..ee05afbe78285 100644
--- a/packages/debug/src/browser/console/debug-console-items.tsx
+++ b/packages/debug/src/browser/console/debug-console-items.tsx
@@ -50,12 +50,12 @@ export class ExpressionContainer implements CompositeConsoleItem {
     protected elements: Promise<ExpressionContainer[]> | undefined;
     async getElements(): Promise<IterableIterator<ExpressionContainer>> {
         if (!this.hasElements || !this.session) {
-            return [].values();
+            return [][Symbol.iterator]();
         }
         if (!this.elements) {
             this.elements = this.doResolve();
         }
-        return (await this.elements).values();
+        return (await this.elements)[Symbol.iterator]();
     }
     protected async doResolve(): Promise<ExpressionContainer[]> {
         const result: ExpressionContainer[] = [];
diff --git a/packages/debug/src/browser/console/debug-console-session.ts b/packages/debug/src/browser/console/debug-console-session.ts
index e95e754d360db..167f3e36f5d5c 100644
--- a/packages/debug/src/browser/console/debug-console-session.ts
+++ b/packages/debug/src/browser/console/debug-console-session.ts
@@ -79,7 +79,7 @@ export class DebugConsoleSession extends ConsoleSession {
     }
 
     getElements(): IterableIterator<ConsoleItem> {
-        return this.items.values();
+        return this.items[Symbol.iterator]();
     }
 
     protected async completions({ textDocument: { uri }, position }: CompletionParams): Promise<CompletionItem[]> {
diff --git a/packages/debug/src/browser/editor/debug-hover-source.tsx b/packages/debug/src/browser/editor/debug-hover-source.tsx
index f8e5e36a2220d..eeb69badb61f3 100644
--- a/packages/debug/src/browser/editor/debug-hover-source.tsx
+++ b/packages/debug/src/browser/editor/debug-hover-source.tsx
@@ -33,7 +33,7 @@ export class DebugHoverSource extends TreeSource {
 
     protected elements: TreeElement[] = [];
     getElements(): IterableIterator<TreeElement> {
-        return this.elements.values();
+        return this.elements[Symbol.iterator]();
     }
 
     protected renderTitle(element: ExpressionItem | DebugVariable): React.ReactNode {
diff --git a/packages/debug/src/browser/view/debug-breakpoints-source.tsx b/packages/debug/src/browser/view/debug-breakpoints-source.tsx
index 36d3c4b6026b2..fe6f43afbd79d 100644
--- a/packages/debug/src/browser/view/debug-breakpoints-source.tsx
+++ b/packages/debug/src/browser/view/debug-breakpoints-source.tsx
@@ -37,7 +37,7 @@ export class DebugBreakpointsSource extends TreeSource {
     }
 
     getElements(): IterableIterator<TreeElement> {
-        return this.model.breakpoints.values();
+        return this.model.breakpoints[Symbol.iterator]();
     }
 
 }
diff --git a/packages/debug/src/browser/view/debug-variables-source.ts b/packages/debug/src/browser/view/debug-variables-source.ts
index 4946ea52b84d8..7d5b6e364ab2c 100644
--- a/packages/debug/src/browser/view/debug-variables-source.ts
+++ b/packages/debug/src/browser/view/debug-variables-source.ts
@@ -43,7 +43,7 @@ export class DebugVariablesSource extends TreeSource {
     async getElements(): Promise<IterableIterator<DebugScope>> {
         const { currentSession } = this.model;
         const scopes = currentSession ? await currentSession.getScopes() : [];
-        return scopes.values();
+        return scopes[Symbol.iterator]();
     }
 
 }