From f64869f8cccbfa2823243b9202ae38f7a93b9d1c Mon Sep 17 00:00:00 2001
From: Josh Tynjala <joshtynjala@bowlerhat.dev>
Date: Fri, 5 Feb 2021 11:20:30 -0800
Subject: [PATCH] Happy New Year

---
 NOTICE                                        |     2 +-
 asconfigc/pom.xml                             |     2 +-
 .../java/com/as3mxml/asconfigc/ASConfigC.java |     2 +-
 .../as3mxml/asconfigc/ASConfigCException.java |     2 +-
 .../as3mxml/asconfigc/ASConfigCOptions.java   |     2 +-
 .../com/as3mxml/asconfigc/TopLevelFields.java |     2 +-
 .../com/as3mxml/asconfigc/air/AIROptions.java |     2 +-
 .../asconfigc/air/AIROptionsParser.java       |     2 +-
 .../as3mxml/asconfigc/air/AIRPlatform.java    |     2 +-
 .../asconfigc/air/AIRSigningOptions.java      |     2 +-
 .../com/as3mxml/asconfigc/air/AIRTarget.java  |     2 +-
 .../asconfigc/animate/AnimateOptions.java     |     2 +-
 .../asconfigc/compiler/CompilerOptions.java   |     2 +-
 .../compiler/CompilerOptionsParser.java       |     2 +-
 .../asconfigc/compiler/ConfigName.java        |     2 +-
 .../asconfigc/compiler/DefaultCompiler.java   |     2 +-
 .../compiler/IASConfigCCompiler.java          |     2 +-
 .../asconfigc/compiler/JSOutputType.java      |     2 +-
 .../asconfigc/compiler/ModuleFields.java      |     2 +-
 .../asconfigc/compiler/ProjectType.java       |     2 +-
 .../asconfigc/compiler/RoyaleTarget.java      |     2 +-
 .../asconfigc/compiler/WorkerFields.java      |     2 +-
 .../HTMLTemplateOptionsParser.java            |     2 +-
 .../asconfigc/utils/ApacheFlexJSUtils.java    |     2 +-
 .../asconfigc/utils/ApacheRoyaleUtils.java    |     2 +-
 .../as3mxml/asconfigc/utils/ConfigUtils.java  |     2 +-
 .../asconfigc/utils/GenericSDKUtils.java      |     2 +-
 .../as3mxml/asconfigc/utils/JsonUtils.java    |     2 +-
 .../asconfigc/utils/OptionsFormatter.java     |     2 +-
 .../as3mxml/asconfigc/utils/OptionsUtils.java |     2 +-
 .../as3mxml/asconfigc/utils/ProjectUtils.java |     2 +-
 .../asconfigc/air/AIROptionsParserTests.java  |     2 +-
 .../compiler/CompilerOptionsParserTests.java  |     2 +-
 .../utils/ConfigUtilsAirOptionsTests.java     |     2 +-
 .../ConfigUtilsCompilerOptionsTests.java      |     2 +-
 .../utils/ConfigUtilsTopLevelTests.java       |     2 +-
 .../utils/OptionsFormatterTests.java          |     2 +-
 .../asconfigc/utils/OptionsUtilsTests.java    |     2 +-
 .../asconfigc/utils/ProjectUtilsTests.java    |     2 +-
 .../com/as3mxml/vscode/CheckJavaVersion.java  |     2 +-
 check-royale-version/pom.xml                  |     2 +-
 .../as3mxml/vscode/CheckRoyaleVersion.java    |     2 +-
 distribution/pom.xml                          |     2 +-
 language-server/pom.xml                       |     2 +-
 .../vscode/ActionScriptLanguageServer.java    |     2 +-
 .../as3mxml/vscode/ActionScriptServices.java  |     2 +-
 .../main/java/com/as3mxml/vscode/Main.java    |     2 +-
 .../vscode/commands/ICommandConstants.java    |     2 +-
 .../vscode/compiler/CompilerShell.java        |     2 +-
 .../DisabledConfigConditionBlockProblem.java  |     2 +-
 .../problems/LSPFileNotFoundProblem.java      |     2 +-
 .../problems/SyntaxFallbackProblem.java       |     2 +-
 .../problems/UnusedImportProblem.java         |     2 +-
 .../vscode/mxml/IMXMLLibraryConstants.java    |     2 +-
 .../ASConfigProjectConfigStrategy.java        |     2 +-
 .../project/ActionScriptProjectData.java      |     2 +-
 .../as3mxml/vscode/project/ILspProject.java   |     2 +-
 .../project/IProjectConfigStrategy.java       |     2 +-
 .../IProjectConfigStrategyFactory.java        |     2 +-
 .../as3mxml/vscode/project/LspJSProject.java  |     2 +-
 .../as3mxml/vscode/project/LspProject.java    |     2 +-
 .../vscode/project/ProjectOptions.java        |     2 +-
 .../project/SimpleProjectConfigStrategy.java  |     2 +-
 .../vscode/project/VSCodeConfiguration.java   |     2 +-
 .../vscode/providers/CodeActionProvider.java  |     2 +-
 .../vscode/providers/CompletionProvider.java  |     2 +-
 .../vscode/providers/DefinitionProvider.java  |     2 +-
 .../providers/DocumentSymbolProvider.java     |     2 +-
 .../providers/ExecuteCommandProvider.java     |     2 +-
 .../vscode/providers/HoverProvider.java       |     2 +-
 .../providers/ImplementationProvider.java     |     2 +-
 .../vscode/providers/ReferencesProvider.java  |     2 +-
 .../vscode/providers/RenameProvider.java      |     2 +-
 .../providers/SignatureHelpProvider.java      |     2 +-
 .../providers/TypeDefinitionProvider.java     |     2 +-
 .../providers/WorkspaceSymbolProvider.java    |     2 +-
 .../services/ActionScriptLanguageClient.java  |     2 +-
 .../com/as3mxml/vscode/utils/ASTUtils.java    |     2 +-
 .../utils/ActionScriptProjectManager.java     |     2 +-
 .../as3mxml/vscode/utils/AddImportData.java   |     2 +-
 .../vscode/utils/CodeActionsUtils.java        |     2 +-
 .../vscode/utils/CompilationUnitUtils.java    |     2 +-
 .../vscode/utils/CompilerProblemFilter.java   |     2 +-
 .../vscode/utils/CompilerProjectUtils.java    |     2 +-
 .../vscode/utils/CompletionItemUtils.java     |     2 +-
 .../utils/DefinitionDocumentationUtils.java   |     2 +-
 .../vscode/utils/DefinitionTextUtils.java     |     2 +-
 .../as3mxml/vscode/utils/DefinitionUtils.java |     2 +-
 .../com/as3mxml/vscode/utils/FileTracker.java |     2 +-
 .../com/as3mxml/vscode/utils/ImportRange.java |     2 +-
 .../vscode/utils/ImportTextEditUtils.java     |     2 +-
 .../com/as3mxml/vscode/utils/LSPUtils.java    |     2 +-
 .../utils/LanguageServerCompilerUtils.java    |     2 +-
 .../utils/LanguageServerFileSpecGetter.java   |     2 +-
 .../as3mxml/vscode/utils/MXMLDataUtils.java   |     2 +-
 .../as3mxml/vscode/utils/MXMLNamespace.java   |     2 +-
 .../vscode/utils/MXMLNamespaceUtils.java      |   211 +-
 .../as3mxml/vscode/utils/ProblemTracker.java  |    29 +-
 .../vscode/utils/RealTimeProblemsChecker.java |   155 +-
 .../com/as3mxml/vscode/utils/ScopeUtils.java  |    46 +-
 .../as3mxml/vscode/utils/SourcePathUtils.java |    78 +-
 .../com/as3mxml/vscode/utils/XmlnsRange.java  |    59 +-
 .../vscode/utils/MXMLNamespaceUtilsTests.java |     2 +-
 pom.xml                                       |     2 +-
 rcsh/pom.xml                                  |     2 +-
 vscode-extension/pom.xml                      |     2 +-
 .../ts/commands/importFlashBuilderProject.ts  |     2 +-
 .../ts/commands/importFlashDevelopProject.ts  |     2 +-
 .../src/main/ts/commands/importProject.ts     |     2 +-
 .../ts/commands/logCompilerShellOutput.ts     |     2 +-
 .../main/ts/commands/quickCompileAndLaunch.ts |     2 +-
 .../main/ts/commands/saveSessionPassword.ts   |     2 +-
 .../main/ts/commands/selectWorkspaceSDK.ts    |     2 +-
 vscode-extension/src/main/ts/extension.ts     |     2 +-
 .../ActionScriptSourcePathDataProvider.ts     |     2 +-
 .../main/ts/utils/ActionScriptTaskProvider.ts |     2 +-
 .../src/main/ts/utils/AnimateTaskProvider.ts  |     2 +-
 .../main/ts/utils/BaseAsconfigTaskProvider.ts |     2 +-
 .../utils/SWCTextDocumentContentProvider.ts   |     2 +-
 .../createActionScriptSDKStatusBarItem.ts     |     2 +-
 .../src/main/ts/utils/findAnimate.ts          |     2 +-
 .../src/main/ts/utils/findJava.ts             |     2 +-
 .../findSDKInFlexHomeEnvironmentVariable.ts   |     2 +-
 .../utils/findSDKInLocalFlexJSNodeModule.ts   |     2 +-
 .../utils/findSDKInLocalRoyaleNodeModule.ts   |     2 +-
 .../findSDKInRoyaleHomeEnvironmentVariable.ts |     2 +-
 .../src/main/ts/utils/findSDKName.ts          |     2 +-
 .../src/main/ts/utils/findSDKShortName.ts     |     2 +-
 .../findSDKsInPathEnvironmentVariable.ts      |     2 +-
 .../utils/getFrameworkSDKPathWithFallbacks.ts |     2 +-
 .../ts/utils/getJavaClassPathDelimiter.ts     |     2 +-
 .../src/main/ts/utils/migrateSettings.ts      |     2 +-
 .../src/main/ts/utils/normalizeUri.ts         |     2 +-
 .../src/main/ts/utils/validateEditorSDK.ts    |     2 +-
 .../src/main/ts/utils/validateFrameworkSDK.ts |     2 +-
 .../src/main/ts/utils/validateJava.ts         |     2 +-
 .../src/test/ts/extension.test.ts             | 36658 +++++++++++-----
 vscode-extension/src/test/ts/index.ts         |    73 +-
 138 files changed, 24917 insertions(+), 12652 deletions(-)

diff --git a/NOTICE b/NOTICE
index 42fb47806..ba5303d89 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,2 +1,2 @@
 ActionScript & MXML extension for Visual Studio Code
-Copyright 2016-2020 Bowler Hat LLC
\ No newline at end of file
+Copyright 2016-2021 Bowler Hat LLC
\ No newline at end of file
diff --git a/asconfigc/pom.xml b/asconfigc/pom.xml
index a68839b6e..031829dd0 100644
--- a/asconfigc/pom.xml
+++ b/asconfigc/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/ASConfigC.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/ASConfigC.java
index ccb87c0b7..3f0430cc1 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/ASConfigC.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/ASConfigC.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/ASConfigCException.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/ASConfigCException.java
index d1e002f92..a8e94b336 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/ASConfigCException.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/ASConfigCException.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/ASConfigCOptions.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/ASConfigCOptions.java
index 6e5e83dbd..2e9ca2197 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/ASConfigCOptions.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/ASConfigCOptions.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/TopLevelFields.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/TopLevelFields.java
index af6daf7b1..5e8d9c783 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/TopLevelFields.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/TopLevelFields.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIROptions.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIROptions.java
index 7dc904f13..c08dbb1c7 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIROptions.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIROptions.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIROptionsParser.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIROptionsParser.java
index 45d1550fb..3855d678c 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIROptionsParser.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIROptionsParser.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIRPlatform.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIRPlatform.java
index a5b2545c0..2d6b29c08 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIRPlatform.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIRPlatform.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIRSigningOptions.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIRSigningOptions.java
index 20f932262..fb430c54b 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIRSigningOptions.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIRSigningOptions.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIRTarget.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIRTarget.java
index 5d4548ea7..1c4769ed8 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIRTarget.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/air/AIRTarget.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/animate/AnimateOptions.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/animate/AnimateOptions.java
index 36b7c0100..25a333ac6 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/animate/AnimateOptions.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/animate/AnimateOptions.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/CompilerOptions.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/CompilerOptions.java
index 3b43529ea..89189d7db 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/CompilerOptions.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/CompilerOptions.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/CompilerOptionsParser.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/CompilerOptionsParser.java
index 02fdadae3..6734f4325 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/CompilerOptionsParser.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/CompilerOptionsParser.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/ConfigName.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/ConfigName.java
index bf5483f99..b50703cb9 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/ConfigName.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/ConfigName.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/DefaultCompiler.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/DefaultCompiler.java
index d2fd983c6..c62d7152c 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/DefaultCompiler.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/DefaultCompiler.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/IASConfigCCompiler.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/IASConfigCCompiler.java
index 6d1224e5f..5117e0de4 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/IASConfigCCompiler.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/IASConfigCCompiler.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/JSOutputType.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/JSOutputType.java
index 4a039824f..14d711e73 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/JSOutputType.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/JSOutputType.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/ModuleFields.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/ModuleFields.java
index a437aa901..86b64f1fa 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/ModuleFields.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/ModuleFields.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/ProjectType.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/ProjectType.java
index d8796830a..94515a788 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/ProjectType.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/ProjectType.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/RoyaleTarget.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/RoyaleTarget.java
index 144e6005d..373a64a0b 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/RoyaleTarget.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/RoyaleTarget.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/WorkerFields.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/WorkerFields.java
index d2c68d84d..0f98b6076 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/WorkerFields.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/compiler/WorkerFields.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/htmlTemplate/HTMLTemplateOptionsParser.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/htmlTemplate/HTMLTemplateOptionsParser.java
index 4dbb24a5a..609796a34 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/htmlTemplate/HTMLTemplateOptionsParser.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/htmlTemplate/HTMLTemplateOptionsParser.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ApacheFlexJSUtils.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ApacheFlexJSUtils.java
index c8138fd5f..a4ec6d007 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ApacheFlexJSUtils.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ApacheFlexJSUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ApacheRoyaleUtils.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ApacheRoyaleUtils.java
index efe4f6ccb..ae09cdede 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ApacheRoyaleUtils.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ApacheRoyaleUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ConfigUtils.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ConfigUtils.java
index e1b4940cd..91df1b0ce 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ConfigUtils.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ConfigUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/GenericSDKUtils.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/GenericSDKUtils.java
index f8890cb8f..29f6d58c7 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/GenericSDKUtils.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/GenericSDKUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/JsonUtils.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/JsonUtils.java
index 8232fa904..5b713c7b2 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/JsonUtils.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/JsonUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/OptionsFormatter.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/OptionsFormatter.java
index 63169fa5b..f08316235 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/OptionsFormatter.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/OptionsFormatter.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/OptionsUtils.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/OptionsUtils.java
index 95ccdcfd1..576e99a78 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/OptionsUtils.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/OptionsUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ProjectUtils.java b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ProjectUtils.java
index b6b834e50..abb97bfe5 100644
--- a/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ProjectUtils.java
+++ b/asconfigc/src/main/java/com/as3mxml/asconfigc/utils/ProjectUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/test/java/com/as3mxml/asconfigc/air/AIROptionsParserTests.java b/asconfigc/src/test/java/com/as3mxml/asconfigc/air/AIROptionsParserTests.java
index f75ac3b45..30d218362 100644
--- a/asconfigc/src/test/java/com/as3mxml/asconfigc/air/AIROptionsParserTests.java
+++ b/asconfigc/src/test/java/com/as3mxml/asconfigc/air/AIROptionsParserTests.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/test/java/com/as3mxml/asconfigc/compiler/CompilerOptionsParserTests.java b/asconfigc/src/test/java/com/as3mxml/asconfigc/compiler/CompilerOptionsParserTests.java
index 04f5fcfde..487ad12b3 100644
--- a/asconfigc/src/test/java/com/as3mxml/asconfigc/compiler/CompilerOptionsParserTests.java
+++ b/asconfigc/src/test/java/com/as3mxml/asconfigc/compiler/CompilerOptionsParserTests.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/ConfigUtilsAirOptionsTests.java b/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/ConfigUtilsAirOptionsTests.java
index 4601607fa..b5a151171 100644
--- a/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/ConfigUtilsAirOptionsTests.java
+++ b/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/ConfigUtilsAirOptionsTests.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/ConfigUtilsCompilerOptionsTests.java b/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/ConfigUtilsCompilerOptionsTests.java
index 5957c6c1c..9385f1f87 100644
--- a/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/ConfigUtilsCompilerOptionsTests.java
+++ b/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/ConfigUtilsCompilerOptionsTests.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/ConfigUtilsTopLevelTests.java b/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/ConfigUtilsTopLevelTests.java
index ff3603963..9ac86b499 100644
--- a/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/ConfigUtilsTopLevelTests.java
+++ b/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/ConfigUtilsTopLevelTests.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/OptionsFormatterTests.java b/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/OptionsFormatterTests.java
index be4b65ddb..e67eda926 100644
--- a/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/OptionsFormatterTests.java
+++ b/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/OptionsFormatterTests.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/OptionsUtilsTests.java b/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/OptionsUtilsTests.java
index 4b090a2b2..6347f177f 100644
--- a/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/OptionsUtilsTests.java
+++ b/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/OptionsUtilsTests.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/ProjectUtilsTests.java b/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/ProjectUtilsTests.java
index 7eb1f5d0b..aec37cfe4 100644
--- a/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/ProjectUtilsTests.java
+++ b/asconfigc/src/test/java/com/as3mxml/asconfigc/utils/ProjectUtilsTests.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/check-java-version/src/main/java/com/as3mxml/vscode/CheckJavaVersion.java b/check-java-version/src/main/java/com/as3mxml/vscode/CheckJavaVersion.java
index 3aa26b52a..29a935f71 100644
--- a/check-java-version/src/main/java/com/as3mxml/vscode/CheckJavaVersion.java
+++ b/check-java-version/src/main/java/com/as3mxml/vscode/CheckJavaVersion.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/check-royale-version/pom.xml b/check-royale-version/pom.xml
index b3f499c47..36ce85c4d 100644
--- a/check-royale-version/pom.xml
+++ b/check-royale-version/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/check-royale-version/src/main/java/com/as3mxml/vscode/CheckRoyaleVersion.java b/check-royale-version/src/main/java/com/as3mxml/vscode/CheckRoyaleVersion.java
index 1f7a0f0ee..413d61706 100644
--- a/check-royale-version/src/main/java/com/as3mxml/vscode/CheckRoyaleVersion.java
+++ b/check-royale-version/src/main/java/com/as3mxml/vscode/CheckRoyaleVersion.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 425d43dc7..57cea5fd0 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/pom.xml b/language-server/pom.xml
index 75baa2fb9..85edb66d3 100644
--- a/language-server/pom.xml
+++ b/language-server/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/ActionScriptLanguageServer.java b/language-server/src/main/java/com/as3mxml/vscode/ActionScriptLanguageServer.java
index a8c3745b7..7b097f9ad 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/ActionScriptLanguageServer.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/ActionScriptLanguageServer.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/ActionScriptServices.java b/language-server/src/main/java/com/as3mxml/vscode/ActionScriptServices.java
index 856780d26..b831b9219 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/ActionScriptServices.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/ActionScriptServices.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/Main.java b/language-server/src/main/java/com/as3mxml/vscode/Main.java
index 233d648e9..1abbd4c60 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/Main.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/Main.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/commands/ICommandConstants.java b/language-server/src/main/java/com/as3mxml/vscode/commands/ICommandConstants.java
index e69f975c8..f66d98a2e 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/commands/ICommandConstants.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/commands/ICommandConstants.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/compiler/CompilerShell.java b/language-server/src/main/java/com/as3mxml/vscode/compiler/CompilerShell.java
index f290b9eae..a3d629305 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/compiler/CompilerShell.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/compiler/CompilerShell.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/compiler/problems/DisabledConfigConditionBlockProblem.java b/language-server/src/main/java/com/as3mxml/vscode/compiler/problems/DisabledConfigConditionBlockProblem.java
index 30cfc8efd..95b1edf0e 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/compiler/problems/DisabledConfigConditionBlockProblem.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/compiler/problems/DisabledConfigConditionBlockProblem.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/compiler/problems/LSPFileNotFoundProblem.java b/language-server/src/main/java/com/as3mxml/vscode/compiler/problems/LSPFileNotFoundProblem.java
index 39ed16c4f..097c69552 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/compiler/problems/LSPFileNotFoundProblem.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/compiler/problems/LSPFileNotFoundProblem.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/compiler/problems/SyntaxFallbackProblem.java b/language-server/src/main/java/com/as3mxml/vscode/compiler/problems/SyntaxFallbackProblem.java
index 7ab3977f5..f8cdb39c5 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/compiler/problems/SyntaxFallbackProblem.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/compiler/problems/SyntaxFallbackProblem.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/compiler/problems/UnusedImportProblem.java b/language-server/src/main/java/com/as3mxml/vscode/compiler/problems/UnusedImportProblem.java
index 8727e527a..d2a1e25f6 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/compiler/problems/UnusedImportProblem.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/compiler/problems/UnusedImportProblem.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/mxml/IMXMLLibraryConstants.java b/language-server/src/main/java/com/as3mxml/vscode/mxml/IMXMLLibraryConstants.java
index ad56f76cd..cba852bfe 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/mxml/IMXMLLibraryConstants.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/mxml/IMXMLLibraryConstants.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/project/ASConfigProjectConfigStrategy.java b/language-server/src/main/java/com/as3mxml/vscode/project/ASConfigProjectConfigStrategy.java
index dc9ad815f..c60b174ee 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/project/ASConfigProjectConfigStrategy.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/project/ASConfigProjectConfigStrategy.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/project/ActionScriptProjectData.java b/language-server/src/main/java/com/as3mxml/vscode/project/ActionScriptProjectData.java
index c2038903d..9303df211 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/project/ActionScriptProjectData.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/project/ActionScriptProjectData.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/project/ILspProject.java b/language-server/src/main/java/com/as3mxml/vscode/project/ILspProject.java
index 546372777..0a9f975eb 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/project/ILspProject.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/project/ILspProject.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/project/IProjectConfigStrategy.java b/language-server/src/main/java/com/as3mxml/vscode/project/IProjectConfigStrategy.java
index 413f7c35f..449d1ea92 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/project/IProjectConfigStrategy.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/project/IProjectConfigStrategy.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/project/IProjectConfigStrategyFactory.java b/language-server/src/main/java/com/as3mxml/vscode/project/IProjectConfigStrategyFactory.java
index 5c056caf2..6cb225ecf 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/project/IProjectConfigStrategyFactory.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/project/IProjectConfigStrategyFactory.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/project/LspJSProject.java b/language-server/src/main/java/com/as3mxml/vscode/project/LspJSProject.java
index ed20db5f2..7d50c4608 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/project/LspJSProject.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/project/LspJSProject.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/project/LspProject.java b/language-server/src/main/java/com/as3mxml/vscode/project/LspProject.java
index 81a0d5dab..a08b97f78 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/project/LspProject.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/project/LspProject.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/project/ProjectOptions.java b/language-server/src/main/java/com/as3mxml/vscode/project/ProjectOptions.java
index cab3fd100..dd3b420aa 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/project/ProjectOptions.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/project/ProjectOptions.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/project/SimpleProjectConfigStrategy.java b/language-server/src/main/java/com/as3mxml/vscode/project/SimpleProjectConfigStrategy.java
index 282792f6a..20a92b89c 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/project/SimpleProjectConfigStrategy.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/project/SimpleProjectConfigStrategy.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/project/VSCodeConfiguration.java b/language-server/src/main/java/com/as3mxml/vscode/project/VSCodeConfiguration.java
index aba333802..75eb7178a 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/project/VSCodeConfiguration.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/project/VSCodeConfiguration.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/providers/CodeActionProvider.java b/language-server/src/main/java/com/as3mxml/vscode/providers/CodeActionProvider.java
index 80c3e7ace..1cb2a574d 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/providers/CodeActionProvider.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/providers/CodeActionProvider.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/providers/CompletionProvider.java b/language-server/src/main/java/com/as3mxml/vscode/providers/CompletionProvider.java
index 2c1be0eb1..93f41830d 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/providers/CompletionProvider.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/providers/CompletionProvider.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/providers/DefinitionProvider.java b/language-server/src/main/java/com/as3mxml/vscode/providers/DefinitionProvider.java
index efeaf56b0..44f3b1467 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/providers/DefinitionProvider.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/providers/DefinitionProvider.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/providers/DocumentSymbolProvider.java b/language-server/src/main/java/com/as3mxml/vscode/providers/DocumentSymbolProvider.java
index 7d6958d61..7c6f95927 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/providers/DocumentSymbolProvider.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/providers/DocumentSymbolProvider.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/providers/ExecuteCommandProvider.java b/language-server/src/main/java/com/as3mxml/vscode/providers/ExecuteCommandProvider.java
index 3bf064472..9055d9665 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/providers/ExecuteCommandProvider.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/providers/ExecuteCommandProvider.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/providers/HoverProvider.java b/language-server/src/main/java/com/as3mxml/vscode/providers/HoverProvider.java
index 4113c49f9..963cc63d3 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/providers/HoverProvider.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/providers/HoverProvider.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/providers/ImplementationProvider.java b/language-server/src/main/java/com/as3mxml/vscode/providers/ImplementationProvider.java
index e8b53d545..0c71385eb 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/providers/ImplementationProvider.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/providers/ImplementationProvider.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/providers/ReferencesProvider.java b/language-server/src/main/java/com/as3mxml/vscode/providers/ReferencesProvider.java
index e114e0c67..8ad9031b0 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/providers/ReferencesProvider.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/providers/ReferencesProvider.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/providers/RenameProvider.java b/language-server/src/main/java/com/as3mxml/vscode/providers/RenameProvider.java
index 1a913e5a1..22cbc1423 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/providers/RenameProvider.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/providers/RenameProvider.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/providers/SignatureHelpProvider.java b/language-server/src/main/java/com/as3mxml/vscode/providers/SignatureHelpProvider.java
index 84eb853ba..8cf81fcae 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/providers/SignatureHelpProvider.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/providers/SignatureHelpProvider.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/providers/TypeDefinitionProvider.java b/language-server/src/main/java/com/as3mxml/vscode/providers/TypeDefinitionProvider.java
index faa455419..ccaeaf4c2 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/providers/TypeDefinitionProvider.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/providers/TypeDefinitionProvider.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/providers/WorkspaceSymbolProvider.java b/language-server/src/main/java/com/as3mxml/vscode/providers/WorkspaceSymbolProvider.java
index 147293bd2..2b752d82c 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/providers/WorkspaceSymbolProvider.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/providers/WorkspaceSymbolProvider.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/services/ActionScriptLanguageClient.java b/language-server/src/main/java/com/as3mxml/vscode/services/ActionScriptLanguageClient.java
index 267154cb0..0f3753ead 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/services/ActionScriptLanguageClient.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/services/ActionScriptLanguageClient.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/ASTUtils.java b/language-server/src/main/java/com/as3mxml/vscode/utils/ASTUtils.java
index 94b31dded..25cbd46c9 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/ASTUtils.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/ASTUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/ActionScriptProjectManager.java b/language-server/src/main/java/com/as3mxml/vscode/utils/ActionScriptProjectManager.java
index e5da67e2c..891589c7d 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/ActionScriptProjectManager.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/ActionScriptProjectManager.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/AddImportData.java b/language-server/src/main/java/com/as3mxml/vscode/utils/AddImportData.java
index f76bbda70..dec1d6c5d 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/AddImportData.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/AddImportData.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/CodeActionsUtils.java b/language-server/src/main/java/com/as3mxml/vscode/utils/CodeActionsUtils.java
index 6eead4b7c..d798a00e7 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/CodeActionsUtils.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/CodeActionsUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/CompilationUnitUtils.java b/language-server/src/main/java/com/as3mxml/vscode/utils/CompilationUnitUtils.java
index 3861eb082..1cc81749e 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/CompilationUnitUtils.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/CompilationUnitUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/CompilerProblemFilter.java b/language-server/src/main/java/com/as3mxml/vscode/utils/CompilerProblemFilter.java
index d046f5954..59dbaf13b 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/CompilerProblemFilter.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/CompilerProblemFilter.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/CompilerProjectUtils.java b/language-server/src/main/java/com/as3mxml/vscode/utils/CompilerProjectUtils.java
index d039f7732..6d296e44c 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/CompilerProjectUtils.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/CompilerProjectUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/CompletionItemUtils.java b/language-server/src/main/java/com/as3mxml/vscode/utils/CompletionItemUtils.java
index f75458a0b..91637fb31 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/CompletionItemUtils.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/CompletionItemUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/DefinitionDocumentationUtils.java b/language-server/src/main/java/com/as3mxml/vscode/utils/DefinitionDocumentationUtils.java
index 54161dc92..88eb01212 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/DefinitionDocumentationUtils.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/DefinitionDocumentationUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/DefinitionTextUtils.java b/language-server/src/main/java/com/as3mxml/vscode/utils/DefinitionTextUtils.java
index ca30e3c9a..91b649f8b 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/DefinitionTextUtils.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/DefinitionTextUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/DefinitionUtils.java b/language-server/src/main/java/com/as3mxml/vscode/utils/DefinitionUtils.java
index fd518aab6..fc3bdc43d 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/DefinitionUtils.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/DefinitionUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/FileTracker.java b/language-server/src/main/java/com/as3mxml/vscode/utils/FileTracker.java
index db815dc5d..bc555c861 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/FileTracker.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/FileTracker.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/ImportRange.java b/language-server/src/main/java/com/as3mxml/vscode/utils/ImportRange.java
index a92e63821..d217f7052 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/ImportRange.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/ImportRange.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/ImportTextEditUtils.java b/language-server/src/main/java/com/as3mxml/vscode/utils/ImportTextEditUtils.java
index 1f69161ce..cd9d59397 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/ImportTextEditUtils.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/ImportTextEditUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/LSPUtils.java b/language-server/src/main/java/com/as3mxml/vscode/utils/LSPUtils.java
index 2f18a09f6..a16f9f226 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/LSPUtils.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/LSPUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/LanguageServerCompilerUtils.java b/language-server/src/main/java/com/as3mxml/vscode/utils/LanguageServerCompilerUtils.java
index deb2925ee..2e5bddc36 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/LanguageServerCompilerUtils.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/LanguageServerCompilerUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/LanguageServerFileSpecGetter.java b/language-server/src/main/java/com/as3mxml/vscode/utils/LanguageServerFileSpecGetter.java
index f3e9a386d..74ed30b3f 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/LanguageServerFileSpecGetter.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/LanguageServerFileSpecGetter.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/MXMLDataUtils.java b/language-server/src/main/java/com/as3mxml/vscode/utils/MXMLDataUtils.java
index 871c849cb..6e0c15795 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/MXMLDataUtils.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/MXMLDataUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/MXMLNamespace.java b/language-server/src/main/java/com/as3mxml/vscode/utils/MXMLNamespace.java
index 55008c5c7..dad7fab05 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/MXMLNamespace.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/MXMLNamespace.java
@@ -1,6 +1,6 @@
 
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/MXMLNamespaceUtils.java b/language-server/src/main/java/com/as3mxml/vscode/utils/MXMLNamespaceUtils.java
index be1e9b1bc..cf29b0334 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/MXMLNamespaceUtils.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/MXMLNamespaceUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -35,8 +35,7 @@
 import org.apache.royale.compiler.projects.IRoyaleProject;
 import org.apache.royale.compiler.workspaces.IWorkspace;
 
-public class MXMLNamespaceUtils
-{
+public class MXMLNamespaceUtils {
     private static final String PREFIX_MX = "mx";
     private static final String PREFIX_FX = "fx";
     private static final String PREFIX_S = "s";
@@ -46,8 +45,7 @@ public class MXMLNamespaceUtils
 
     private static final HashMap<String, String> NAMESPACE_TO_PREFIX = new HashMap<>();
 
-    static
-    {
+    static {
         //MXML language
         NAMESPACE_TO_PREFIX.put(IMXMLLanguageConstants.NAMESPACE_MXML_2009, PREFIX_FX);
         NAMESPACE_TO_PREFIX.put(IMXMLLanguageConstants.NAMESPACE_MXML_2006, PREFIX_MX);
@@ -55,7 +53,7 @@ public class MXMLNamespaceUtils
         //Flex
         NAMESPACE_TO_PREFIX.put(IMXMLLibraryConstants.SPARK, PREFIX_S);
         NAMESPACE_TO_PREFIX.put(IMXMLLibraryConstants.MX, PREFIX_MX);
-        
+
         //FlexJS
         NAMESPACE_TO_PREFIX.put(IMXMLLibraryConstants.FLEXJS_EXPRESS, PREFIX_JS);
         NAMESPACE_TO_PREFIX.put(IMXMLLibraryConstants.FLEXJS_BASIC, PREFIX_JS);
@@ -69,78 +67,65 @@ public class MXMLNamespaceUtils
         NAMESPACE_TO_PREFIX.put(IMXMLLibraryConstants.FEATHERS, PREFIX_F);
     }
 
-    private static final Pattern[] PATTERNS =
-    {
-        //Royale/FlexJS library
-        Pattern.compile("^library:\\/\\/ns\\.apache\\.org\\/(?:flexjs|royale)\\/(\\w+)$"),
+    private static final Pattern[] PATTERNS = {
+            //Royale/FlexJS library
+            Pattern.compile("^library:\\/\\/ns\\.apache\\.org\\/(?:flexjs|royale)\\/(\\w+)$"),
 
-        //Flex library
-        Pattern.compile("^[a-z]+:\\/\\/flex\\.apache\\.org\\/(\\w+)\\/ns$"),
+            //Flex library
+            Pattern.compile("^[a-z]+:\\/\\/flex\\.apache\\.org\\/(\\w+)\\/ns$"),
 
-        //Final fallback (extracts domain name)
-        Pattern.compile("^[a-z]+:\\/\\/(?:\\w+\\.)?(\\w+)\\.\\w+\\/"),
-    };
+            //Final fallback (extracts domain name)
+            Pattern.compile("^[a-z]+:\\/\\/(?:\\w+\\.)?(\\w+)\\.\\w+\\/"), };
 
-	private static final String PREFIX_LOCAL = "local";
-	private static final String PREFIX_DEFAULT_NS = "ns";
+    private static final String PREFIX_LOCAL = "local";
+    private static final String PREFIX_DEFAULT_NS = "ns";
     private static final String STAR = "*";
     private static final String DOT_STAR = ".*";
     private static final String UNDERSCORE_UNDERSCORE_AS3_PACKAGE = "__AS3__.";
 
-	public static MXMLNamespace getMXMLLanguageNamespace(IMXMLTagData tagData)
-    {
+    public static MXMLNamespace getMXMLLanguageNamespace(IMXMLTagData tagData) {
         PrefixMap prefixMap = tagData.getCompositePrefixMap();
         String fxURI = tagData.getMXMLDialect().getLanguageNamespace();
         MXMLNamespace fxNS = getNamespaceFromURI(fxURI, prefixMap);
         return fxNS;
     }
 
-	public static MXMLNamespace getMXMLLanguageNamespace(IFileSpecification fileSpec, IWorkspace workspace)
-    {
+    public static MXMLNamespace getMXMLLanguageNamespace(IFileSpecification fileSpec, IWorkspace workspace) {
         IMXMLDataManager mxmlDataManager = workspace.getMXMLDataManager();
         MXMLData mxmlData = (MXMLData) mxmlDataManager.get(fileSpec);
         IMXMLTagData rootTag = mxmlData.getRootTag();
-        if (rootTag == null)
-        {
+        if (rootTag == null) {
             return null;
         }
         return getMXMLLanguageNamespace(rootTag);
     }
 
-    public static MXMLNamespace getNamespaceFromURI(String uri, PrefixMap prefixMap)
-    {
-        if (prefixMap != null)
-        {
+    public static MXMLNamespace getNamespaceFromURI(String uri, PrefixMap prefixMap) {
+        if (prefixMap != null) {
             String[] uriPrefixes = prefixMap.getPrefixesForNamespace(uri);
-            if (uriPrefixes.length > 0)
-            {
+            if (uriPrefixes.length > 0) {
                 return new MXMLNamespace(uriPrefixes[0], uri);
             }
         }
 
         //we'll check if the namespace comes from a known library
         //with a common prefix
-        if (NAMESPACE_TO_PREFIX.containsKey(uri))
-        {
+        if (NAMESPACE_TO_PREFIX.containsKey(uri)) {
             String prefix = NAMESPACE_TO_PREFIX.get(uri);
 
             prefix = validatePrefix(prefix, prefixMap);
-            if (prefix != null)
-            {
+            if (prefix != null) {
                 return new MXMLNamespace(prefix, uri);
             }
         }
-        
+
         //try to guess a good prefix based on common formats
-        for (Pattern pattern : PATTERNS)
-        {
+        for (Pattern pattern : PATTERNS) {
             Matcher matcher = pattern.matcher(uri);
-            if (matcher.find())
-            {
+            if (matcher.find()) {
                 String prefix = matcher.group(1);
                 prefix = validatePrefix(prefix, prefixMap);
-                if (prefix != null)
-                {
+                if (prefix != null) {
                     return new MXMLNamespace(prefix, uri);
                 }
             }
@@ -149,55 +134,44 @@ public static MXMLNamespace getNamespaceFromURI(String uri, PrefixMap prefixMap)
         return null;
     }
 
-    private static String validatePrefix(String prefix, PrefixMap prefixMap)
-    {
-        if (prefix == null)
-        {
+    private static String validatePrefix(String prefix, PrefixMap prefixMap) {
+        if (prefix == null) {
             return null;
         }
 
-        if (prefixMap != null && prefixMap.containsPrefix(prefix))
-        {
+        if (prefixMap != null && prefixMap.containsPrefix(prefix)) {
             //the prefix already exists with a different URI, so we can't
             //use it for this URI
-           return null;
+            return null;
         }
-        
+
         //prefixes shouldn't start with a number
-        if (Character.isDigit(prefix.charAt(0)))
-        {
+        if (Character.isDigit(prefix.charAt(0))) {
             return null;
         }
 
         return prefix;
     }
 
-    private static boolean isPreferredNamespace(String tagNamespace, List<String> tagNamespaces, MXMLData mxmlData)
-    {
-        if (tagNamespace.equals(IMXMLLibraryConstants.MX) && tagNamespaces.contains(IMXMLLibraryConstants.SPARK))
-        {
+    private static boolean isPreferredNamespace(String tagNamespace, List<String> tagNamespaces, MXMLData mxmlData) {
+        if (tagNamespace.equals(IMXMLLibraryConstants.MX) && tagNamespaces.contains(IMXMLLibraryConstants.SPARK)) {
             //if we find mx, but spark also exists, we prefer spark
             //while mx and spark usually have different implementations,
             //sometimes, the same component class is defined in both namespaces!
             return false;
         }
-        if (tagNamespace.equals(IMXMLLanguageConstants.NAMESPACE_MXML_2006))
-        {
+        if (tagNamespace.equals(IMXMLLanguageConstants.NAMESPACE_MXML_2006)) {
             IMXMLTagData rootTag = mxmlData.getRootTag();
-            if (rootTag != null)
-            {
+            if (rootTag != null) {
                 String rootLanguageNamespace = rootTag.getMXMLDialect().getLanguageNamespace();
-                if(!rootLanguageNamespace.equals(tagNamespace))
-                {
-                    if(tagNamespaces.contains(IMXMLLibraryConstants.MX))
-                    {
+                if (!rootLanguageNamespace.equals(tagNamespace)) {
+                    if (tagNamespaces.contains(IMXMLLibraryConstants.MX)) {
                         //if we find the mxml 2006 language namepace, but
                         //we're using a newer language namespace, and the mx
                         //library also exists, we prefer the library
                         return false;
                     }
-                    if(tagNamespaces.contains(rootLanguageNamespace))
-                    {
+                    if (tagNamespaces.contains(rootLanguageNamespace)) {
                         //getTagNamesForClass() may sometimes return the
                         //mxml 2006 namespace, even if that's not what we're
                         //using in this file.
@@ -209,15 +183,14 @@ private static boolean isPreferredNamespace(String tagNamespace, List<String> ta
         return true;
     }
 
-    public static MXMLNamespace getMXMLNamespaceForTypeDefinition(ITypeDefinition definition, MXMLData mxmlData, IRoyaleProject currentProject)
-    {
+    public static MXMLNamespace getMXMLNamespaceForTypeDefinition(ITypeDefinition definition, MXMLData mxmlData,
+            IRoyaleProject currentProject) {
         //the prefix map may be null, if the file is empty
         PrefixMap prefixMap = mxmlData.getRootTagPrefixMap();
 
         Collection<XMLName> tagNames = currentProject.getTagNamesForClass(definition.getQualifiedName());
         List<String> xmlNamespaces = new ArrayList<>();
-        for (XMLName tagName : tagNames)
-        {
+        for (XMLName tagName : tagNames) {
             //creating a new collection with only the namespace strings for easy
             //searching for other values
             String tagNamespace = tagName.getXMLNamespace();
@@ -225,20 +198,16 @@ public static MXMLNamespace getMXMLNamespaceForTypeDefinition(ITypeDefinition de
         }
 
         //1. try to use an existing xmlns with an uri
-        if (prefixMap != null)
-        {
-            for (String tagNamespace : xmlNamespaces)
-            {
-                if (!isPreferredNamespace(tagNamespace, xmlNamespaces, mxmlData))
-                {
+        if (prefixMap != null) {
+            for (String tagNamespace : xmlNamespaces) {
+                if (!isPreferredNamespace(tagNamespace, xmlNamespaces, mxmlData)) {
                     //skip namespaces that we'd rather not use in the current
                     //context. for example, we prefer spark over mx, and this
                     //class may be defined in both namespaces.
                     continue;
                 }
                 String[] uriPrefixes = prefixMap.getPrefixesForNamespace(tagNamespace);
-                if (uriPrefixes.length > 0)
-                {
+                if (uriPrefixes.length > 0) {
                     String firstPrefix = uriPrefixes[0];
                     return new MXMLNamespace(firstPrefix, tagNamespace);
                 }
@@ -248,11 +217,9 @@ public static MXMLNamespace getMXMLNamespaceForTypeDefinition(ITypeDefinition de
         //2. try to use an existing xmlns with a package name
         String packageName = definition.getPackageName();
         String packageNamespace = getPackageNameMXMLNamespaceURI(packageName);
-        if (prefixMap != null)
-        {
+        if (prefixMap != null) {
             String[] packagePrefixes = prefixMap.getPrefixesForNamespace(packageNamespace);
-            if (packagePrefixes.length > 0)
-            {
+            if (packagePrefixes.length > 0) {
                 return new MXMLNamespace(packagePrefixes[0], packageNamespace);
             }
         }
@@ -260,20 +227,17 @@ public static MXMLNamespace getMXMLNamespaceForTypeDefinition(ITypeDefinition de
         //3. try to create a new xmlns with a prefix and uri
 
         //special case for the __AS3__ package
-        if (packageName != null && packageName.startsWith(UNDERSCORE_UNDERSCORE_AS3_PACKAGE))
-        {
+        if (packageName != null && packageName.startsWith(UNDERSCORE_UNDERSCORE_AS3_PACKAGE)) {
             //anything in this package is in the language namespace
             IMXMLTagData rootTag = mxmlData.getRootTag();
             //we'll use the file dialect, but if it's not available, this is the
             //default we should use
             String fxNamespace = IMXMLLanguageConstants.NAMESPACE_MXML_2009;
-            if (rootTag != null)
-            {
+            if (rootTag != null) {
                 fxNamespace = rootTag.getMXMLDialect().getLanguageNamespace();
             }
             MXMLNamespace resultNS = MXMLNamespaceUtils.getNamespaceFromURI(fxNamespace, prefixMap);
-            if (resultNS != null)
-            {
+            if (resultNS != null) {
                 return resultNS;
             }
         }
@@ -284,90 +248,75 @@ public static MXMLNamespace getMXMLNamespaceForTypeDefinition(ITypeDefinition de
         //we're searching again through the available namespaces. previously,
         //we looked for uris that were already used. now we want to find one
         //that hasn't been used yet
-        for (String tagNamespace : xmlNamespaces)
-        {
-            if (!isPreferredNamespace(tagNamespace, xmlNamespaces, mxmlData))
-            {
+        for (String tagNamespace : xmlNamespaces) {
+            if (!isPreferredNamespace(tagNamespace, xmlNamespaces, mxmlData)) {
                 //same as above, we should skip over certain namespaces when
                 //there's a better option available.
                 continue;
             }
             String[] uriPrefixes = null;
-            if (prefixMap != null)
-            {
+            if (prefixMap != null) {
                 uriPrefixes = prefixMap.getPrefixesForNamespace(tagNamespace);
             }
-            if (uriPrefixes == null || uriPrefixes.length == 0)
-            {
+            if (uriPrefixes == null || uriPrefixes.length == 0) {
                 //we know this type is in one or more namespaces
                 //let's try to figure out a nice prefix to use.
                 //if we don't find our preferred prefix, we'll still
                 //remember the uri for later.
                 fallbackNamespace = tagNamespace;
                 MXMLNamespace resultNS = MXMLNamespaceUtils.getNamespaceFromURI(fallbackNamespace, prefixMap);
-                if (resultNS != null)
-                {
+                if (resultNS != null) {
                     return resultNS;
                 }
             }
         }
 
-        if (fallbackNamespace != null)
-        {
+        if (fallbackNamespace != null) {
             //if we couldn't find a known prefix, use a numbered one
             String prefix = getNumberedNamespacePrefix(PREFIX_DEFAULT_NS, prefixMap);
             return new MXMLNamespace(prefix, fallbackNamespace);
-		}
-		
-		//4. special case: if the package namespace is simply *, try to use
-		//local as the prefix, if it's not already defined. this matches the
-		//behavior of Adobe Flash Builder.
-		if (packageNamespace.equals(STAR) && (prefixMap == null || !prefixMap.containsPrefix(PREFIX_LOCAL)))
-		{
-			return new MXMLNamespace(PREFIX_LOCAL, packageNamespace);
-		}
-
-		//5. try to use the final part of the package name as the prefix, if
-		//it's not already defined.
-		if (packageName != null && packageName.length() > 0)
-		{
-			String[] parts = packageName.split("\\.");
-			String finalPart = parts[parts.length - 1];
-			if (prefixMap == null || !prefixMap.containsPrefix(finalPart))
-			{
-				return new MXMLNamespace(finalPart, packageNamespace);
-			}
-		}
+        }
+
+        //4. special case: if the package namespace is simply *, try to use
+        //local as the prefix, if it's not already defined. this matches the
+        //behavior of Adobe Flash Builder.
+        if (packageNamespace.equals(STAR) && (prefixMap == null || !prefixMap.containsPrefix(PREFIX_LOCAL))) {
+            return new MXMLNamespace(PREFIX_LOCAL, packageNamespace);
+        }
+
+        //5. try to use the final part of the package name as the prefix, if
+        //it's not already defined.
+        if (packageName != null && packageName.length() > 0) {
+            String[] parts = packageName.split("\\.");
+            String finalPart = parts[parts.length - 1];
+            if (prefixMap == null || !prefixMap.containsPrefix(finalPart)) {
+                return new MXMLNamespace(finalPart, packageNamespace);
+            }
+        }
 
         //6. worst case: create a new xmlns with numbered prefix and package name
         String prefix = getNumberedNamespacePrefix(PREFIX_DEFAULT_NS, prefixMap);
         return new MXMLNamespace(prefix, packageNamespace);
     }
 
-    private static String getPackageNameMXMLNamespaceURI(String packageName)
-    {
-        if (packageName != null && packageName.length() > 0)
-        {
+    private static String getPackageNameMXMLNamespaceURI(String packageName) {
+        if (packageName != null && packageName.length() > 0) {
             return packageName + DOT_STAR;
         }
         return STAR;
     }
 
-    private static String getNumberedNamespacePrefix(String prefixPrefix, PrefixMap prefixMap)
-    {
+    private static String getNumberedNamespacePrefix(String prefixPrefix, PrefixMap prefixMap) {
         //if all else fails, fall back to a generic namespace
         int count = 1;
         String prefix = null;
-        do
-        {
+        do {
             prefix = prefixPrefix + count;
-            if (prefixMap != null && prefixMap.containsPrefix(prefix))
-            {
+            if (prefixMap != null && prefixMap.containsPrefix(prefix)) {
                 prefix = null;
             }
             count++;
-        }
-        while (prefix == null);
+        } while (prefix == null);
         return prefix;
     }
 }
\ No newline at end of file
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/ProblemTracker.java b/language-server/src/main/java/com/as3mxml/vscode/utils/ProblemTracker.java
index 3aaa46a17..d258e39f1 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/ProblemTracker.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/ProblemTracker.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,49 +26,40 @@
  * Tracks files that have previously had problems so that they can be cleared
  * when the problems are fixed.
  */
-public class ProblemTracker
-{
+public class ProblemTracker {
     private LanguageClient languageClient;
     private HashSet<URI> newFilesWithProblems = new HashSet<>();
     private HashSet<URI> staleFilesWithProblems = new HashSet<>();
 
-    public ProblemTracker()
-    {
+    public ProblemTracker() {
     }
 
-    public LanguageClient getLanguageClient()
-    {
+    public LanguageClient getLanguageClient() {
         return languageClient;
     }
 
-    public void setLanguageClient(LanguageClient value)
-    {
+    public void setLanguageClient(LanguageClient value) {
         languageClient = value;
     }
 
-    public void trackFileWithProblems(URI uri)
-    {
+    public void trackFileWithProblems(URI uri) {
         newFilesWithProblems.add(uri);
         staleFilesWithProblems.remove(uri);
     }
 
-    public void makeStale()
-    {
+    public void makeStale() {
         staleFilesWithProblems.addAll(newFilesWithProblems);
         newFilesWithProblems.clear();
     }
 
-    public void releaseStale()
-    {
+    public void releaseStale() {
         //if any files have been removed, they will still appear in this set, so
         //clear the errors so that they don't persist
-        for (URI uri : staleFilesWithProblems)
-        {
+        for (URI uri : staleFilesWithProblems) {
             PublishDiagnosticsParams publish = new PublishDiagnosticsParams();
             publish.setDiagnostics(new ArrayList<>());
             publish.setUri(uri.toString());
-            if (languageClient != null)
-            {
+            if (languageClient != null) {
                 languageClient.publishDiagnostics(publish);
             }
         }
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/RealTimeProblemsChecker.java b/language-server/src/main/java/com/as3mxml/vscode/utils/RealTimeProblemsChecker.java
index a18a5ca64..9b19e727d 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/RealTimeProblemsChecker.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/RealTimeProblemsChecker.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -41,10 +41,8 @@
 import org.eclipse.lsp4j.PublishDiagnosticsParams;
 import org.eclipse.lsp4j.services.LanguageClient;
 
-public class RealTimeProblemsChecker implements Runnable
-{
-	public RealTimeProblemsChecker(LanguageClient languageClient, CompilerProblemFilter filter)
-	{
+public class RealTimeProblemsChecker implements Runnable {
+	public RealTimeProblemsChecker(LanguageClient languageClient, CompilerProblemFilter filter) {
 		this.languageClient = languageClient;
 		this.compilerProblemFilter = filter;
 	}
@@ -59,23 +57,20 @@ public RealTimeProblemsChecker(LanguageClient languageClient, CompilerProblemFil
 	private ActionScriptProjectData projectData;
 	private IFileSpecification fileSpec;
 	private ICompilationUnit compilationUnit;
-	
-	public synchronized IFileSpecification getFileSpecification()
-	{
+
+	public synchronized IFileSpecification getFileSpecification() {
 		return fileSpec;
 	}
 
-	public synchronized void setFileSpecification(IFileSpecification newFileSpec)
-	{
+	public synchronized void setFileSpecification(IFileSpecification newFileSpec) {
 		pendingProjectData = projectData;
 		pendingCompilationUnit = compilationUnit;
 		pendingFileSpec = newFileSpec;
 	}
 
-	public synchronized void setCompilationUnit(ICompilationUnit compilationUnit, IFileSpecification fileSpec, ActionScriptProjectData projectData)
-	{
-		if(this.compilationUnit != null && this.compilationUnit != compilationUnit)
-		{
+	public synchronized void setCompilationUnit(ICompilationUnit compilationUnit, IFileSpecification fileSpec,
+			ActionScriptProjectData projectData) {
+		if (this.compilationUnit != null && this.compilationUnit != compilationUnit) {
 			updateNow();
 			pendingProjectData = projectData;
 			pendingCompilationUnit = compilationUnit;
@@ -94,8 +89,7 @@ public synchronized void setCompilationUnit(ICompilationUnit compilationUnit, IF
 		abcBytesRequest = compilationUnit.getABCBytesRequest();
 	}
 
-	public synchronized void clear()
-	{
+	public synchronized void clear() {
 		projectData = null;
 		compilationUnit = null;
 		fileSpec = null;
@@ -104,37 +98,30 @@ public synchronized void clear()
 		pendingFileSpec = null;
 	}
 
-	public synchronized void updateNow()
-	{
+	public synchronized void updateNow() {
 		applyPending();
-		if(compilationUnit == null)
-		{
+		if (compilationUnit == null) {
 			return;
 		}
-		if(syntaxTreeRequest == null)
-		{
+		if (syntaxTreeRequest == null) {
 			syntaxTreeRequest = compilationUnit.getSyntaxTreeRequest();
 		}
-		if(fileScopeRequest == null)
-		{
+		if (fileScopeRequest == null) {
 			fileScopeRequest = compilationUnit.getFileScopeRequest();
 		}
-		if(outgoingDepsRequest == null)
-		{
+		if (outgoingDepsRequest == null) {
 			outgoingDepsRequest = compilationUnit.getOutgoingDependenciesRequest();
 		}
-		if(abcBytesRequest == null)
-		{
+		if (abcBytesRequest == null) {
 			abcBytesRequest = compilationUnit.getABCBytesRequest();
 		}
-		try
-		{
+		try {
 			syntaxTreeRequest.get();
 			fileScopeRequest.get();
 			outgoingDepsRequest.get();
 			abcBytesRequest.get();
+		} catch (InterruptedException e) {
 		}
-		catch(InterruptedException e) {}
 	}
 
 	private IRequest<ISyntaxTreeRequestResult, ICompilationUnit> syntaxTreeRequest;
@@ -142,93 +129,71 @@ public synchronized void updateNow()
 	private IRequest<IOutgoingDependenciesRequestResult, ICompilationUnit> outgoingDepsRequest;
 	private IRequest<IABCBytesRequestResult, ICompilationUnit> abcBytesRequest;
 
-	private synchronized long getWaitTime()
-	{
-		if(compilationUnit != null)
-		{
+	private synchronized long getWaitTime() {
+		if (compilationUnit != null) {
 			return 100;
 		}
 		return 500;
 	}
 
-	public void run()
-	{
-		while (true)
-		{
-			if(Thread.currentThread().isInterrupted())
-			{
+	public void run() {
+		while (true) {
+			if (Thread.currentThread().isInterrupted()) {
 				break;
 			}
 			checkForProblems();
 			long waitTime = getWaitTime();
-			try
-			{
+			try {
 				//wait a short time between checks
 				//it's okay if problems are updated a little slowly
 				Thread.sleep(waitTime);
+			} catch (InterruptedException e) {
 			}
-			catch(InterruptedException e) {}
 		}
 	}
 
-	private synchronized void checkForProblems()
-	{
-		if (compilationUnit == null)
-		{
+	private synchronized void checkForProblems() {
+		if (compilationUnit == null) {
 			return;
 		}
-		if (compilationUnit.getProject() == null)
-		{
+		if (compilationUnit.getProject() == null) {
 			//this compilation unit is no longer valid
 			clear();
 			return;
 		}
-		if (syntaxTreeRequest == null)
-		{
+		if (syntaxTreeRequest == null) {
 			syntaxTreeRequest = compilationUnit.getSyntaxTreeRequest();
 		}
-		if (fileScopeRequest == null)
-		{
+		if (fileScopeRequest == null) {
 			fileScopeRequest = compilationUnit.getFileScopeRequest();
 		}
-		if (outgoingDepsRequest == null)
-		{
+		if (outgoingDepsRequest == null) {
 			outgoingDepsRequest = compilationUnit.getOutgoingDependenciesRequest();
 		}
-		if (abcBytesRequest == null)
-		{
+		if (abcBytesRequest == null) {
 			abcBytesRequest = compilationUnit.getABCBytesRequest();
 		}
-		if(syntaxTreeRequest.isDone()
-				&& fileScopeRequest.isDone()
-				&& outgoingDepsRequest.isDone()
-				&& abcBytesRequest.isDone())
-		{
+		if (syntaxTreeRequest.isDone() && fileScopeRequest.isDone() && outgoingDepsRequest.isDone()
+				&& abcBytesRequest.isDone()) {
 			publishDiagnostics();
 			syntaxTreeRequest = null;
 			fileScopeRequest = null;
 			outgoingDepsRequest = null;
 			abcBytesRequest = null;
-			if(pendingCompilationUnit != null)
-			{
+			if (pendingCompilationUnit != null) {
 				applyPending();
-			}
-			else
-			{
+			} else {
 				clear();
 			}
 		}
 	}
 
-	private synchronized void applyPending()
-	{
-		if(pendingCompilationUnit == null)
-		{
+	private synchronized void applyPending() {
+		if (pendingCompilationUnit == null) {
 			return;
 		}
 
-		if(pendingCompilationUnit == compilationUnit)
-		{
+		if (pendingCompilationUnit == compilationUnit) {
 			IWorkspace workspace = projectData.project.getWorkspace();
 			workspace.fileChanged(pendingFileSpec);
 		}
@@ -246,51 +211,43 @@ private synchronized void applyPending()
 		abcBytesRequest = null;
 	}
 
-	private synchronized void publishDiagnostics()
-	{
-		if(compilationUnit == null)
-		{
+	private synchronized void publishDiagnostics() {
+		if (compilationUnit == null) {
 			return;
 		}
 		ArrayList<Diagnostic> diagnostics = new ArrayList<>();
 		ArrayList<ICompilerProblem> problems = new ArrayList<>();
-        try
-        {
+		try {
 			Collections.addAll(problems, syntaxTreeRequest.get().getProblems());
 			Collections.addAll(problems, fileScopeRequest.get().getProblems());
 			Collections.addAll(problems, outgoingDepsRequest.get().getProblems());
 			ICompilerProblem[] probs = abcBytesRequest.get().getProblems();
-			for (ICompilerProblem prob : probs)
-			{
-				if (!(prob instanceof InternalCompilerProblem2))
-				{
+			for (ICompilerProblem prob : probs) {
+				if (!(prob instanceof InternalCompilerProblem2)) {
 					problems.add(prob);
 				}
 			}
-			
+
 			ILspProject project = projectData.project;
 			Set<String> requiredImports = project.getQNamesOfDependencies(compilationUnit);
 			IASNode ast = syntaxTreeRequest.get().getAST();
 			ASTUtils.findUnusedImportProblems(ast, requiredImports, problems);
 			ASTUtils.findDisabledConfigConditionBlockProblems(ast, problems);
-        }
-        catch (Exception e)
-        {
-            System.err.println("Exception in compiler while checking for problems: " + e);
-            e.printStackTrace(System.err);
+		} catch (Exception e) {
+			System.err.println("Exception in compiler while checking for problems: " + e);
+			e.printStackTrace(System.err);
 
-            Diagnostic diagnostic = LSPUtils.createDiagnosticWithoutRange();
-            diagnostic.setSeverity(DiagnosticSeverity.Error);
-            diagnostic.setMessage("A fatal error occurred while checking a file for problems: " + compilationUnit.getAbsoluteFilename());
+			Diagnostic diagnostic = LSPUtils.createDiagnosticWithoutRange();
+			diagnostic.setSeverity(DiagnosticSeverity.Error);
+			diagnostic.setMessage("A fatal error occurred while checking a file for problems: "
+					+ compilationUnit.getAbsoluteFilename());
 			diagnostics.add(diagnostic);
 		}
 
 		ProblemQuery problemQuery = new ProblemQuery(projectData.configurator.getCompilerProblemSettings());
 		problemQuery.addAll(problems);
-		for (ICompilerProblem problem : problemQuery.getFilteredProblems())
-		{
-			if (compilerProblemFilter != null && !compilerProblemFilter.isAllowed(problem))
-			{
+		for (ICompilerProblem problem : problemQuery.getFilteredProblems()) {
+			if (compilerProblemFilter != null && !compilerProblemFilter.isAllowed(problem)) {
 				continue;
 			}
 			Diagnostic diagnostic = LanguageServerCompilerUtils.getDiagnosticFromCompilerProblem(problem);
@@ -298,8 +255,8 @@ private synchronized void publishDiagnostics()
 		}
 
 		URI uri = Paths.get(compilationUnit.getAbsoluteFilename()).toUri();
-        PublishDiagnosticsParams publish = new PublishDiagnosticsParams();
-        publish.setDiagnostics(diagnostics);
+		PublishDiagnosticsParams publish = new PublishDiagnosticsParams();
+		publish.setDiagnostics(diagnostics);
 		publish.setUri(uri.toString());
 		languageClient.publishDiagnostics(publish);
 	}
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/ScopeUtils.java b/language-server/src/main/java/com/as3mxml/vscode/utils/ScopeUtils.java
index 534be6301..dc2cc9b76 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/ScopeUtils.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/ScopeUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -29,50 +29,41 @@
 import org.apache.royale.compiler.scopes.IASScope;
 import org.apache.royale.compiler.tree.as.IScopedNode;
 
-public class ScopeUtils
-{
-    public static Set<INamespaceDefinition> getNamespaceSetForScopes(TypeScope typeScope, ASScope otherScope, ICompilerProject project)
-    {
+public class ScopeUtils {
+    public static Set<INamespaceDefinition> getNamespaceSetForScopes(TypeScope typeScope, ASScope otherScope,
+            ICompilerProject project) {
         Set<INamespaceDefinition> namespaceSet = new HashSet<>(otherScope.getNamespaceSet(project));
-        if (typeScope.getContainingDefinition() instanceof IInterfaceDefinition)
-        {
+        if (typeScope.getContainingDefinition() instanceof IInterfaceDefinition) {
             //interfaces have a special namespace that isn't actually the same
             //as public, but should be treated the same way
             IInterfaceDefinition interfaceDefinition = (IInterfaceDefinition) typeScope.getContainingDefinition();
             collectInterfaceNamespaces(interfaceDefinition, namespaceSet, project);
         }
         IClassDefinition otherContainingClass = otherScope.getContainingClass();
-        if (otherContainingClass != null)
-        {
+        if (otherContainingClass != null) {
             IClassDefinition classDefinition = typeScope.getContainingClass();
-            if (classDefinition != null)
-            {
-                boolean isSuperClass = Arrays.asList(otherContainingClass.resolveAncestry(project)).contains(classDefinition);
-                if (isSuperClass)
-                {
+            if (classDefinition != null) {
+                boolean isSuperClass = Arrays.asList(otherContainingClass.resolveAncestry(project))
+                        .contains(classDefinition);
+                if (isSuperClass) {
                     //if the containing class of the type scope is a superclass
                     //of the other scope, we need to add the protected
                     //namespaces from the super classes
-                    do
-                    {
+                    do {
                         namespaceSet.add(classDefinition.getProtectedNamespaceReference());
                         classDefinition = classDefinition.resolveBaseClass(project);
-                    }
-                    while (classDefinition instanceof IClassDefinition);
+                    } while (classDefinition instanceof IClassDefinition);
                 }
             }
         }
         return namespaceSet;
     }
 
-    public static ITypeDefinition getContainingTypeDefinitionForScope(IScopedNode scopedNode)
-    {
+    public static ITypeDefinition getContainingTypeDefinitionForScope(IScopedNode scopedNode) {
         IScopedNode currentNode = scopedNode;
-        while (currentNode != null)
-        {
+        while (currentNode != null) {
             IASScope currentScope = currentNode.getScope();
-            if (currentScope instanceof TypeScope)
-            {
+            if (currentScope instanceof TypeScope) {
                 TypeScope typeScope = (TypeScope) currentScope;
                 return (ITypeDefinition) typeScope.getContainingDefinition();
             }
@@ -81,13 +72,12 @@ public static ITypeDefinition getContainingTypeDefinitionForScope(IScopedNode sc
         return null;
     }
 
-    private static void collectInterfaceNamespaces(IInterfaceDefinition interfaceDefinition, Set<INamespaceDefinition> namespaceSet, ICompilerProject project)
-    {
+    private static void collectInterfaceNamespaces(IInterfaceDefinition interfaceDefinition,
+            Set<INamespaceDefinition> namespaceSet, ICompilerProject project) {
         TypeScope typeScope = (TypeScope) interfaceDefinition.getContainedScope();
         namespaceSet.addAll(typeScope.getNamespaceSet(project));
         IInterfaceDefinition[] interfaceDefinitions = interfaceDefinition.resolveExtendedInterfaces(project);
-        for (IInterfaceDefinition extendedInterface : interfaceDefinitions)
-        {
+        for (IInterfaceDefinition extendedInterface : interfaceDefinitions) {
             collectInterfaceNamespaces(extendedInterface, namespaceSet, project);
         }
     }
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/SourcePathUtils.java b/language-server/src/main/java/com/as3mxml/vscode/utils/SourcePathUtils.java
index 3861a6e56..663425a30 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/SourcePathUtils.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/SourcePathUtils.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,23 +25,18 @@
 import org.apache.royale.compiler.projects.IASProject;
 import org.apache.royale.compiler.projects.IRoyaleProject;
 
-public class SourcePathUtils
-{
-    public static String getPackageForDirectoryPath(Path directory, IASProject project)
-    {
+public class SourcePathUtils {
+    public static String getPackageForDirectoryPath(Path directory, IASProject project) {
         //find the source path that the parent directory is inside
         //that way we can strip it down to just the package
         String basePath = null;
-        for (File sourcePath : project.getSourcePath())
-        {
-            if (directory.startsWith(sourcePath.toPath()))
-            {
+        for (File sourcePath : project.getSourcePath()) {
+            if (directory.startsWith(sourcePath.toPath())) {
                 basePath = sourcePath.toPath().toString();
                 break;
             }
         }
-        if (basePath == null)
-        {
+        if (basePath == null) {
             //we couldn't find the source path!
             return "";
         }
@@ -51,33 +46,25 @@ public static String getPackageForDirectoryPath(Path directory, IASProject proje
         expectedPackage = expectedPackage.replaceAll("/", ".");
         //replaces \ in path on Windows
         expectedPackage = expectedPackage.replaceAll("\\\\", ".");
-        if (expectedPackage.startsWith("."))
-        {
+        if (expectedPackage.startsWith(".")) {
             expectedPackage = expectedPackage.substring(1);
         }
         return expectedPackage;
     }
 
-    public static boolean isInProjectSourcePath(Path path, IASProject project, RoyaleProjectConfigurator configurator)
-    {
-		if (project == null)
-		{
-			return false;
-		}
-        for (File sourcePath : project.getSourcePath())
-        {
-			if (path.startsWith(sourcePath.toPath()))
-			{
-				return true;
-			}
+    public static boolean isInProjectSourcePath(Path path, IASProject project, RoyaleProjectConfigurator configurator) {
+        if (project == null) {
+            return false;
         }
-        if (configurator != null)
-        {
+        for (File sourcePath : project.getSourcePath()) {
+            if (path.startsWith(sourcePath.toPath())) {
+                return true;
+            }
+        }
+        if (configurator != null) {
             Configuration configuration = configurator.getConfiguration();
-            for (String includedSource : configuration.getIncludeSources())
-            {
-                if (path.startsWith(Paths.get(includedSource)))
-                {
+            for (String includedSource : configuration.getIncludeSources()) {
+                if (path.startsWith(Paths.get(includedSource))) {
                     return true;
                 }
             }
@@ -85,27 +72,22 @@ public static boolean isInProjectSourcePath(Path path, IASProject project, Royal
         return false;
     }
 
-    public static boolean isInProjectLibraryPathOrExternalLibraryPath(Path path, IRoyaleProject project, Configuration configuration)
-    {
-		if (project == null || configuration == null)
-		{
-			return false;
+    public static boolean isInProjectLibraryPathOrExternalLibraryPath(Path path, IRoyaleProject project,
+            Configuration configuration) {
+        if (project == null || configuration == null) {
+            return false;
         }
         List<String> libraryPaths = project.getCompilerLibraryPath(configuration);
-        for (String libraryPath : libraryPaths)
-        {
-			if (path.startsWith(Paths.get(libraryPath)))
-			{
-				return true;
-			}
+        for (String libraryPath : libraryPaths) {
+            if (path.startsWith(Paths.get(libraryPath))) {
+                return true;
+            }
         }
         List<String> externalLibraryPaths = project.getCompilerExternalLibraryPath(configuration);
-        for (String externalLibraryPath : externalLibraryPaths)
-        {
-			if (path.startsWith(Paths.get(externalLibraryPath)))
-			{
-				return true;
-			}
+        for (String externalLibraryPath : externalLibraryPaths) {
+            if (path.startsWith(Paths.get(externalLibraryPath))) {
+                return true;
+            }
         }
         return false;
     }
diff --git a/language-server/src/main/java/com/as3mxml/vscode/utils/XmlnsRange.java b/language-server/src/main/java/com/as3mxml/vscode/utils/XmlnsRange.java
index df3241fd4..2470cb94e 100644
--- a/language-server/src/main/java/com/as3mxml/vscode/utils/XmlnsRange.java
+++ b/language-server/src/main/java/com/as3mxml/vscode/utils/XmlnsRange.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,37 +21,30 @@
 import org.apache.royale.compiler.mxml.IMXMLTagAttributeData;
 import org.apache.royale.compiler.mxml.IMXMLTagData;
 
-public class XmlnsRange
-{
-	public String uri = null;
-	public int startIndex = -1;
-	public int endIndex = -1;
+public class XmlnsRange {
+    public String uri = null;
+    public int startIndex = -1;
+    public int endIndex = -1;
 
-    public static XmlnsRange fromOffsetTag(IMXMLTagData tagData, int currentOffset)
-    {
-		XmlnsRange range = new XmlnsRange();
-		if (tagData == null)
-		{
-			return range;
-		}
+    public static XmlnsRange fromOffsetTag(IMXMLTagData tagData, int currentOffset) {
+        XmlnsRange range = new XmlnsRange();
+        if (tagData == null) {
+            return range;
+        }
+
+        IMXMLData mxmlData = tagData.getParent();
 
-		IMXMLData mxmlData = tagData.getParent();
-		
-		IMXMLTagData rootTag = mxmlData.getRootTag();
-        if (rootTag == null)
-        {
+        IMXMLTagData rootTag = mxmlData.getRootTag();
+        if (rootTag == null) {
             return null;
         }
 
-		int startIndex = -1;
-		int endIndex = -1;
+        int startIndex = -1;
+        int endIndex = -1;
         IMXMLTagAttributeData[] attributeDatas = rootTag.getAttributeDatas();
-        for (IMXMLTagAttributeData attributeData : attributeDatas)
-        {
-            if (!attributeData.getName().startsWith("xmlns"))
-            {
-                if (startIndex == -1)
-                {
+        for (IMXMLTagAttributeData attributeData : attributeDatas) {
+            if (!attributeData.getName().startsWith("xmlns")) {
+                if (startIndex == -1) {
                     startIndex = attributeData.getStart();
                     endIndex = startIndex;
                 }
@@ -59,18 +52,16 @@ public static XmlnsRange fromOffsetTag(IMXMLTagData tagData, int currentOffset)
             }
             int start = attributeData.getAbsoluteStart();
             int end = attributeData.getValueEnd() + 1;
-            if (startIndex == -1 || startIndex > start)
-            {
+            if (startIndex == -1 || startIndex > start) {
                 startIndex = start;
             }
-            if (endIndex == -1 || endIndex < end)
-            {
+            if (endIndex == -1 || endIndex < end) {
                 endIndex = end;
             }
-		}
-		range.startIndex = startIndex;
-		range.endIndex = endIndex;
-		range.uri = Paths.get(tagData.getSourcePath()).toUri().toString();
+        }
+        range.startIndex = startIndex;
+        range.endIndex = endIndex;
+        range.uri = Paths.get(tagData.getSourcePath()).toUri().toString();
 
         return range;
     }
diff --git a/language-server/src/test/java/com/as3mxml/vscode/utils/MXMLNamespaceUtilsTests.java b/language-server/src/test/java/com/as3mxml/vscode/utils/MXMLNamespaceUtilsTests.java
index 228f463f2..a6fd23e34 100644
--- a/language-server/src/test/java/com/as3mxml/vscode/utils/MXMLNamespaceUtilsTests.java
+++ b/language-server/src/test/java/com/as3mxml/vscode/utils/MXMLNamespaceUtilsTests.java
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/pom.xml b/pom.xml
index bba7ce238..dfc6ff6eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/rcsh/pom.xml b/rcsh/pom.xml
index 889d7222c..8b4639124 100644
--- a/rcsh/pom.xml
+++ b/rcsh/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/pom.xml b/vscode-extension/pom.xml
index 76e81a56b..dff510e51 100644
--- a/vscode-extension/pom.xml
+++ b/vscode-extension/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/commands/importFlashBuilderProject.ts b/vscode-extension/src/main/ts/commands/importFlashBuilderProject.ts
index 6ad6b4f45..7867da427 100644
--- a/vscode-extension/src/main/ts/commands/importFlashBuilderProject.ts
+++ b/vscode-extension/src/main/ts/commands/importFlashBuilderProject.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/commands/importFlashDevelopProject.ts b/vscode-extension/src/main/ts/commands/importFlashDevelopProject.ts
index 5a9ea615d..de7196398 100644
--- a/vscode-extension/src/main/ts/commands/importFlashDevelopProject.ts
+++ b/vscode-extension/src/main/ts/commands/importFlashDevelopProject.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/commands/importProject.ts b/vscode-extension/src/main/ts/commands/importProject.ts
index 361decbdb..c86ead976 100644
--- a/vscode-extension/src/main/ts/commands/importProject.ts
+++ b/vscode-extension/src/main/ts/commands/importProject.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/commands/logCompilerShellOutput.ts b/vscode-extension/src/main/ts/commands/logCompilerShellOutput.ts
index dd221a9b9..8209e1246 100644
--- a/vscode-extension/src/main/ts/commands/logCompilerShellOutput.ts
+++ b/vscode-extension/src/main/ts/commands/logCompilerShellOutput.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/commands/quickCompileAndLaunch.ts b/vscode-extension/src/main/ts/commands/quickCompileAndLaunch.ts
index c1a4809e7..4597511e9 100644
--- a/vscode-extension/src/main/ts/commands/quickCompileAndLaunch.ts
+++ b/vscode-extension/src/main/ts/commands/quickCompileAndLaunch.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/commands/saveSessionPassword.ts b/vscode-extension/src/main/ts/commands/saveSessionPassword.ts
index 0fd93c919..1e9fbff36 100644
--- a/vscode-extension/src/main/ts/commands/saveSessionPassword.ts
+++ b/vscode-extension/src/main/ts/commands/saveSessionPassword.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/commands/selectWorkspaceSDK.ts b/vscode-extension/src/main/ts/commands/selectWorkspaceSDK.ts
index c27ec21c6..30a3fda49 100644
--- a/vscode-extension/src/main/ts/commands/selectWorkspaceSDK.ts
+++ b/vscode-extension/src/main/ts/commands/selectWorkspaceSDK.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/extension.ts b/vscode-extension/src/main/ts/extension.ts
index 830ab9719..fba484e22 100644
--- a/vscode-extension/src/main/ts/extension.ts
+++ b/vscode-extension/src/main/ts/extension.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/ActionScriptSourcePathDataProvider.ts b/vscode-extension/src/main/ts/utils/ActionScriptSourcePathDataProvider.ts
index 5c3adad67..f1ded7ed6 100644
--- a/vscode-extension/src/main/ts/utils/ActionScriptSourcePathDataProvider.ts
+++ b/vscode-extension/src/main/ts/utils/ActionScriptSourcePathDataProvider.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/ActionScriptTaskProvider.ts b/vscode-extension/src/main/ts/utils/ActionScriptTaskProvider.ts
index cbfd0dbe4..871d94df7 100644
--- a/vscode-extension/src/main/ts/utils/ActionScriptTaskProvider.ts
+++ b/vscode-extension/src/main/ts/utils/ActionScriptTaskProvider.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/AnimateTaskProvider.ts b/vscode-extension/src/main/ts/utils/AnimateTaskProvider.ts
index 2d605a373..a2159d707 100644
--- a/vscode-extension/src/main/ts/utils/AnimateTaskProvider.ts
+++ b/vscode-extension/src/main/ts/utils/AnimateTaskProvider.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/BaseAsconfigTaskProvider.ts b/vscode-extension/src/main/ts/utils/BaseAsconfigTaskProvider.ts
index e16d39e47..05ecc1337 100644
--- a/vscode-extension/src/main/ts/utils/BaseAsconfigTaskProvider.ts
+++ b/vscode-extension/src/main/ts/utils/BaseAsconfigTaskProvider.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/SWCTextDocumentContentProvider.ts b/vscode-extension/src/main/ts/utils/SWCTextDocumentContentProvider.ts
index ed8352119..6e0a3e3f4 100644
--- a/vscode-extension/src/main/ts/utils/SWCTextDocumentContentProvider.ts
+++ b/vscode-extension/src/main/ts/utils/SWCTextDocumentContentProvider.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/createActionScriptSDKStatusBarItem.ts b/vscode-extension/src/main/ts/utils/createActionScriptSDKStatusBarItem.ts
index 16478f35b..b881f1a20 100644
--- a/vscode-extension/src/main/ts/utils/createActionScriptSDKStatusBarItem.ts
+++ b/vscode-extension/src/main/ts/utils/createActionScriptSDKStatusBarItem.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/findAnimate.ts b/vscode-extension/src/main/ts/utils/findAnimate.ts
index fd05a8d06..42d229b11 100644
--- a/vscode-extension/src/main/ts/utils/findAnimate.ts
+++ b/vscode-extension/src/main/ts/utils/findAnimate.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/findJava.ts b/vscode-extension/src/main/ts/utils/findJava.ts
index 7105b6b96..de475c5cd 100644
--- a/vscode-extension/src/main/ts/utils/findJava.ts
+++ b/vscode-extension/src/main/ts/utils/findJava.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/findSDKInFlexHomeEnvironmentVariable.ts b/vscode-extension/src/main/ts/utils/findSDKInFlexHomeEnvironmentVariable.ts
index 65b272bce..0f6429fe5 100644
--- a/vscode-extension/src/main/ts/utils/findSDKInFlexHomeEnvironmentVariable.ts
+++ b/vscode-extension/src/main/ts/utils/findSDKInFlexHomeEnvironmentVariable.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/findSDKInLocalFlexJSNodeModule.ts b/vscode-extension/src/main/ts/utils/findSDKInLocalFlexJSNodeModule.ts
index c726c792f..3b4905971 100644
--- a/vscode-extension/src/main/ts/utils/findSDKInLocalFlexJSNodeModule.ts
+++ b/vscode-extension/src/main/ts/utils/findSDKInLocalFlexJSNodeModule.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/findSDKInLocalRoyaleNodeModule.ts b/vscode-extension/src/main/ts/utils/findSDKInLocalRoyaleNodeModule.ts
index 4ec7d18b3..9b73f968d 100644
--- a/vscode-extension/src/main/ts/utils/findSDKInLocalRoyaleNodeModule.ts
+++ b/vscode-extension/src/main/ts/utils/findSDKInLocalRoyaleNodeModule.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/findSDKInRoyaleHomeEnvironmentVariable.ts b/vscode-extension/src/main/ts/utils/findSDKInRoyaleHomeEnvironmentVariable.ts
index 209c2b7b2..cae5e3a60 100644
--- a/vscode-extension/src/main/ts/utils/findSDKInRoyaleHomeEnvironmentVariable.ts
+++ b/vscode-extension/src/main/ts/utils/findSDKInRoyaleHomeEnvironmentVariable.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/findSDKName.ts b/vscode-extension/src/main/ts/utils/findSDKName.ts
index aa5ce2727..d727a3c1b 100644
--- a/vscode-extension/src/main/ts/utils/findSDKName.ts
+++ b/vscode-extension/src/main/ts/utils/findSDKName.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/findSDKShortName.ts b/vscode-extension/src/main/ts/utils/findSDKShortName.ts
index 9cbe6cd9b..e39b72281 100644
--- a/vscode-extension/src/main/ts/utils/findSDKShortName.ts
+++ b/vscode-extension/src/main/ts/utils/findSDKShortName.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/findSDKsInPathEnvironmentVariable.ts b/vscode-extension/src/main/ts/utils/findSDKsInPathEnvironmentVariable.ts
index 922060ed7..bafba0480 100644
--- a/vscode-extension/src/main/ts/utils/findSDKsInPathEnvironmentVariable.ts
+++ b/vscode-extension/src/main/ts/utils/findSDKsInPathEnvironmentVariable.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/getFrameworkSDKPathWithFallbacks.ts b/vscode-extension/src/main/ts/utils/getFrameworkSDKPathWithFallbacks.ts
index c1d189094..a54989761 100644
--- a/vscode-extension/src/main/ts/utils/getFrameworkSDKPathWithFallbacks.ts
+++ b/vscode-extension/src/main/ts/utils/getFrameworkSDKPathWithFallbacks.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/getJavaClassPathDelimiter.ts b/vscode-extension/src/main/ts/utils/getJavaClassPathDelimiter.ts
index cc4944226..71c828e8e 100644
--- a/vscode-extension/src/main/ts/utils/getJavaClassPathDelimiter.ts
+++ b/vscode-extension/src/main/ts/utils/getJavaClassPathDelimiter.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/migrateSettings.ts b/vscode-extension/src/main/ts/utils/migrateSettings.ts
index 6e502390b..e411cc1d0 100644
--- a/vscode-extension/src/main/ts/utils/migrateSettings.ts
+++ b/vscode-extension/src/main/ts/utils/migrateSettings.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/normalizeUri.ts b/vscode-extension/src/main/ts/utils/normalizeUri.ts
index 842e51227..0e07b7a8d 100644
--- a/vscode-extension/src/main/ts/utils/normalizeUri.ts
+++ b/vscode-extension/src/main/ts/utils/normalizeUri.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/validateEditorSDK.ts b/vscode-extension/src/main/ts/utils/validateEditorSDK.ts
index 0e69351e6..2f689ad73 100644
--- a/vscode-extension/src/main/ts/utils/validateEditorSDK.ts
+++ b/vscode-extension/src/main/ts/utils/validateEditorSDK.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/validateFrameworkSDK.ts b/vscode-extension/src/main/ts/utils/validateFrameworkSDK.ts
index 94dd9088b..0bbb33c3a 100644
--- a/vscode-extension/src/main/ts/utils/validateFrameworkSDK.ts
+++ b/vscode-extension/src/main/ts/utils/validateFrameworkSDK.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/main/ts/utils/validateJava.ts b/vscode-extension/src/main/ts/utils/validateJava.ts
index 2307b4f89..0f3a76b87 100644
--- a/vscode-extension/src/main/ts/utils/validateJava.ts
+++ b/vscode-extension/src/main/ts/utils/validateJava.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/vscode-extension/src/test/ts/extension.test.ts b/vscode-extension/src/test/ts/extension.test.ts
index 7f77f38a7..2dcd356ac 100644
--- a/vscode-extension/src/test/ts/extension.test.ts
+++ b/vscode-extension/src/test/ts/extension.test.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,12191 +22,24607 @@ const COMMAND_ADD_IMPORT = "as3mxml.addImport";
 const COMMAND_ADD_MXML_NAMESPACE = "as3mxml.addMXMLNamespace";
 const COMMAND_ORGANIZE_IMPORTS_IN_URI = "as3mxml.organizeImportsInUri";
 
-function openAndEditDocument(uri: vscode.Uri, callback: (editor: vscode.TextEditor) => PromiseLike<void>): PromiseLike<void>
-{
-	return vscode.workspace.openTextDocument(uri)
-		.then(
-			(document: vscode.TextDocument) => new Promise(resolve => setTimeout(resolve, 100, document)),
-			(err) => assert(false, "Failed to open text document: " + uri + "\n" + err)
-		)
-		.then((document: vscode.TextDocument) => vscode.window.showTextDocument(document),
-			(err) => assert(false, "Failed to show text document: " + uri + "\n" + err)
-		)
-		.then(callback);
+function openAndEditDocument(
+  uri: vscode.Uri,
+  callback: (editor: vscode.TextEditor) => PromiseLike<void>
+): PromiseLike<void> {
+  return vscode.workspace
+    .openTextDocument(uri)
+    .then(
+      (document: vscode.TextDocument) =>
+        new Promise((resolve) => setTimeout(resolve, 100, document)),
+      (err) =>
+        assert(false, "Failed to open text document: " + uri + "\n" + err)
+    )
+    .then(
+      (document: vscode.TextDocument) =>
+        vscode.window.showTextDocument(document),
+      (err) =>
+        assert(false, "Failed to show text document: " + uri + "\n" + err)
+    )
+    .then(callback);
 }
 
-function revertAndCloseActiveEditor(): PromiseLike<void>
-{
-	return vscode.commands.executeCommand("workbench.action.revertAndCloseActiveEditor").then(() =>
-	{
-		return new Promise(resolve => setTimeout(resolve, 100));
-	});
+function revertAndCloseActiveEditor(): PromiseLike<void> {
+  return vscode.commands
+    .executeCommand("workbench.action.revertAndCloseActiveEditor")
+    .then(() => {
+      return new Promise((resolve) => setTimeout(resolve, 100));
+    });
 }
 
-function revertAndCloseAllEditors()
-{
-	return vscode.commands.executeCommand("workbench.action.revertAndCloseActiveEditor").then(() =>
-	{
-		return new Promise((resolve, reject) =>
-		{
-			setTimeout(() =>
-			{
-				if(vscode.window.activeTextEditor)
-				{
-					resolve(revertAndCloseAllEditors());
-					return;
-				}
-				resolve();
-			}, 100);
-		});
-	}, (reason) =>
-	{
-		console.error("close text editor failed:", reason);
-	});
+function revertAndCloseAllEditors() {
+  return vscode.commands
+    .executeCommand("workbench.action.revertAndCloseActiveEditor")
+    .then(
+      () => {
+        return new Promise((resolve, reject) => {
+          setTimeout(() => {
+            if (vscode.window.activeTextEditor) {
+              resolve(revertAndCloseAllEditors());
+              return;
+            }
+            resolve();
+          }, 100);
+        });
+      },
+      (reason) => {
+        console.error("close text editor failed:", reason);
+      }
+    );
 }
 
-function createRange(startLine: number, startCharacter:number,
-	endLine?: number, endCharacter? : number): vscode.Range
-{
-	if(endLine === undefined)
-	{
-		endLine = startLine;
-	}
-	if(endCharacter === undefined)
-	{
-		endCharacter = startCharacter;
-	}
-	return new vscode.Range(
-		new vscode.Position(startLine, startCharacter),
-		new vscode.Position(endLine, endCharacter))
+function createRange(
+  startLine: number,
+  startCharacter: number,
+  endLine?: number,
+  endCharacter?: number
+): vscode.Range {
+  if (endLine === undefined) {
+    endLine = startLine;
+  }
+  if (endCharacter === undefined) {
+    endCharacter = startCharacter;
+  }
+  return new vscode.Range(
+    new vscode.Position(startLine, startCharacter),
+    new vscode.Position(endLine, endCharacter)
+  );
 }
 
-function findDocumentSymbol(symbols: vscode.DocumentSymbol[], symbolToFind: vscode.DocumentSymbol): boolean
-{
-	return symbols.some((symbol: vscode.DocumentSymbol) =>
-	{
-		if(symbol.children && findDocumentSymbol(symbol.children, symbolToFind))
-		{
-			return true;
-		}
-		if(symbol.name !== symbolToFind.name)
-		{
-			return false;
-		}
-		if(symbol.kind !== symbolToFind.kind)
-		{
-			return false;
-		}
-		if(symbol.range.start.line !== symbolToFind.range.start.line)
-		{
-			return false;
-		}
-		if(symbol.range.start.character !== symbolToFind.range.start.character)
-		{
-			return false;
-		}
-		return true;
-	});
+function findDocumentSymbol(
+  symbols: vscode.DocumentSymbol[],
+  symbolToFind: vscode.DocumentSymbol
+): boolean {
+  return symbols.some((symbol: vscode.DocumentSymbol) => {
+    if (symbol.children && findDocumentSymbol(symbol.children, symbolToFind)) {
+      return true;
+    }
+    if (symbol.name !== symbolToFind.name) {
+      return false;
+    }
+    if (symbol.kind !== symbolToFind.kind) {
+      return false;
+    }
+    if (symbol.range.start.line !== symbolToFind.range.start.line) {
+      return false;
+    }
+    if (symbol.range.start.character !== symbolToFind.range.start.character) {
+      return false;
+    }
+    return true;
+  });
 }
 
-function findSymbolInformation(symbols: vscode.SymbolInformation[], symbolToFind: vscode.SymbolInformation): boolean
-{
-	return symbols.some((symbol: vscode.SymbolInformation) =>
-	{
-		if(symbol.name !== symbolToFind.name)
-		{
-			return false;
-		}
-		if(symbolToFind.containerName && symbol.containerName !== symbolToFind.containerName)
-		{
-			return false;
-		}
-		if(symbol.kind !== symbolToFind.kind)
-		{
-			return false;
-		}
-		if(symbol.location.uri.toString() !== symbolToFind.location.uri.toString())
-		{
-			return false;
-		}
-		if(symbol.location.range.start.line !== symbolToFind.location.range.start.line)
-		{
-			return false;
-		}
-		if(symbol.location.range.start.character !== symbolToFind.location.range.start.character)
-		{
-			return false;
-		}
-		return true;
-	});
+function findSymbolInformation(
+  symbols: vscode.SymbolInformation[],
+  symbolToFind: vscode.SymbolInformation
+): boolean {
+  return symbols.some((symbol: vscode.SymbolInformation) => {
+    if (symbol.name !== symbolToFind.name) {
+      return false;
+    }
+    if (
+      symbolToFind.containerName &&
+      symbol.containerName !== symbolToFind.containerName
+    ) {
+      return false;
+    }
+    if (symbol.kind !== symbolToFind.kind) {
+      return false;
+    }
+    if (
+      symbol.location.uri.toString() !== symbolToFind.location.uri.toString()
+    ) {
+      return false;
+    }
+    if (
+      symbol.location.range.start.line !==
+      symbolToFind.location.range.start.line
+    ) {
+      return false;
+    }
+    if (
+      symbol.location.range.start.character !==
+      symbolToFind.location.range.start.character
+    ) {
+      return false;
+    }
+    return true;
+  });
 }
 
-function findCompletionItemOfKind(name: string, kind: vscode.CompletionItemKind, items: vscode.CompletionItem[]): vscode.CompletionItem
-{
-	return items.find((item: vscode.CompletionItem) =>
-	{
-		return item.label === name && item.kind === kind;
-	});
+function findCompletionItemOfKind(
+  name: string,
+  kind: vscode.CompletionItemKind,
+  items: vscode.CompletionItem[]
+): vscode.CompletionItem {
+  return items.find((item: vscode.CompletionItem) => {
+    return item.label === name && item.kind === kind;
+  });
 }
 
-function findCompletionItem(name: string, items: vscode.CompletionItem[]): vscode.CompletionItem
-{
-	return items.find((item: vscode.CompletionItem) =>
-	{
-		return item.label === name;
-	});
+function findCompletionItem(
+  name: string,
+  items: vscode.CompletionItem[]
+): vscode.CompletionItem {
+  return items.find((item: vscode.CompletionItem) => {
+    return item.label === name;
+  });
 }
 
-function containsCompletionItemsOtherThanTextOrSnippet(items: vscode.CompletionItem[]): boolean
-{
-	return items.some((item: vscode.CompletionItem) =>
-	{
-		//vscode can automatically provide Text items based on other text in the editor
-		return item.kind !== vscode.CompletionItemKind.Text &&
-			//vscode simply include snippets everywhere in the file, without restriction
-			item.kind !== vscode.CompletionItemKind.Snippet;
-	})
+function containsCompletionItemsOtherThanTextOrSnippet(
+  items: vscode.CompletionItem[]
+): boolean {
+  return items.some((item: vscode.CompletionItem) => {
+    //vscode can automatically provide Text items based on other text in the editor
+    return (
+      item.kind !== vscode.CompletionItemKind.Text &&
+      //vscode simply include snippets everywhere in the file, without restriction
+      item.kind !== vscode.CompletionItemKind.Snippet
+    );
+  });
 }
 
-function findImportCodeActionForType(qualifiedName: string, codeActions: vscode.CodeAction[])
-{
-	for(let i = 0, count = codeActions.length; i < count; i++)
-	{
-		let codeAction = codeActions[i];
-		if(codeAction.title === "Import " + qualifiedName)
-		{
-			return codeAction;
-		}
-	}
-	return null;
+function findImportCodeActionForType(
+  qualifiedName: string,
+  codeActions: vscode.CodeAction[]
+) {
+  for (let i = 0, count = codeActions.length; i < count; i++) {
+    let codeAction = codeActions[i];
+    if (codeAction.title === "Import " + qualifiedName) {
+      return codeAction;
+    }
+  }
+  return null;
 }
 
-suite("ActionScript & MXML extension: Application workspace", () =>
-{
-	test("vscode.extensions.getExtension(), isActive, and isLanguageClientReady", (done) =>
-	{
-		let extension = vscode.extensions.getExtension(EXTENSION_ID);
-		assert.ok(extension, `Extension "${EXTENSION_ID}" not found!`);
-		//wait a bit for the the extension to fully activate because we need
-		//the project to be fully loaded into the compiler for future tests
-		setTimeout(() =>
-		{
-			assert.ok(extension.isActive, `Extension "${EXTENSION_ID}" not active!`);
-			assert.ok(extension.exports.isLanguageClientReady, `Extension "${EXTENSION_ID}" language client not ready!`);
-			done();
-		}, 6500);
-	});
+suite("ActionScript & MXML extension: Application workspace", () => {
+  test("vscode.extensions.getExtension(), isActive, and isLanguageClientReady", (done) => {
+    let extension = vscode.extensions.getExtension(EXTENSION_ID);
+    assert.ok(extension, `Extension "${EXTENSION_ID}" not found!`);
+    //wait a bit for the the extension to fully activate because we need
+    //the project to be fully loaded into the compiler for future tests
+    setTimeout(() => {
+      assert.ok(extension.isActive, `Extension "${EXTENSION_ID}" not active!`);
+      assert.ok(
+        extension.exports.isLanguageClientReady,
+        `Extension "${EXTENSION_ID}" language client not ready!`
+      );
+      done();
+    }, 6500);
+  });
 });
 
-suite("document symbol provider: Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeDocumentSymbolProvider not empty", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentSymbolProvider", uri)
-				.then((symbols: vscode.DocumentSymbol[]) =>
-					{
-						assert.notStrictEqual(symbols.length, 0,
-							"vscode.executeDocumentSymbolProvider failed to provide symbols in text document: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute document symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentSymbolProvider includes class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentSymbolProvider", uri)
-				.then((symbols: vscode.DocumentSymbol[]) =>
-					{
-						let className = "Main";
-						assert.ok(findDocumentSymbol(symbols, new vscode.DocumentSymbol(
-							className,
-							null,
-							vscode.SymbolKind.Class,
-							createRange(2, 14),
-							createRange(2, 14))),
-							"vscode.executeDocumentSymbolProvider failed to provide symbol for class: " + className);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute document symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentSymbolProvider includes constructor", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentSymbolProvider", uri)
-				.then((symbols: vscode.DocumentSymbol[]) =>
-					{
-						let className = "Main";
-						assert.ok(findDocumentSymbol(symbols, new vscode.DocumentSymbol(
-							className,
-							null,
-							vscode.SymbolKind.Constructor,
-							createRange(16, 18),
-							createRange(16, 18))),
-							"vscode.executeDocumentSymbolProvider failed to provide symbol for constructor: " + className);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute document symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentSymbolProvider includes member variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentSymbolProvider", uri)
-				.then((symbols: vscode.DocumentSymbol[]) =>
-					{
-						let memberVarName = "memberVar";
-						assert.ok(findDocumentSymbol(symbols, new vscode.DocumentSymbol(
-							memberVarName,
-							null,
-							vscode.SymbolKind.Field,
-							createRange(21, 13),
-							createRange(21, 13))),
-							"vscode.executeDocumentSymbolProvider failed to provide symbol for member variable: " + memberVarName);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute document symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentSymbolProvider includes member function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentSymbolProvider", uri)
-				.then((symbols: vscode.DocumentSymbol[]) =>
-					{
-						let memberFunctionName = "memberFunction";
-						assert.ok(findDocumentSymbol(symbols, new vscode.DocumentSymbol(
-							memberFunctionName,
-							null,
-							vscode.SymbolKind.Method,
-							createRange(23, 19),
-							createRange(23, 19))),
-							"vscode.executeDocumentSymbolProvider failed to provide symbol for member function: " + memberFunctionName);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute document symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentSymbolProvider includes member property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentSymbolProvider", uri)
-				.then((symbols: vscode.DocumentSymbol[]) =>
-					{
-						let memberPropertyName = "memberProperty";
-						assert.ok(findDocumentSymbol(symbols, new vscode.DocumentSymbol(
-							memberPropertyName,
-							null,
-							vscode.SymbolKind.Property,
-							createRange(27, 22),
-							createRange(27, 22))),
-							"vscode.executeDocumentSymbolProvider failed to provide symbol for member variable: " + memberPropertyName);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute document symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentSymbolProvider includes static variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentSymbolProvider", uri)
-				.then((symbols: vscode.DocumentSymbol[]) =>
-					{
-						let staticVarName = "staticVar";
-						assert.ok(findDocumentSymbol(symbols, new vscode.DocumentSymbol(
-							staticVarName,
-							null,
-							vscode.SymbolKind.Field,
-							createRange(4, 21),
-							createRange(4, 21))),
-							"vscode.executeDocumentSymbolProvider failed to provide symbol for static variable: " + staticVarName);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute document symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentSymbolProvider includes static constant", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentSymbolProvider", uri)
-				.then((symbols: vscode.DocumentSymbol[]) =>
-					{
-						let staticConstName = "STATIC_CONST";
-						assert.ok(findDocumentSymbol(symbols, new vscode.DocumentSymbol(
-							staticConstName,
-							null,
-							vscode.SymbolKind.Constant,
-							createRange(5, 22),
-							createRange(5, 22))),
-							"vscode.executeDocumentSymbolProvider failed to provide symbol for static constant: " + staticConstName);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute document symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentSymbolProvider includes static function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentSymbolProvider", uri)
-				.then((symbols: vscode.DocumentSymbol[]) =>
-					{
-						let staticFunctionName = "staticFunction";
-						assert.ok(findDocumentSymbol(symbols, new vscode.DocumentSymbol(
-							staticFunctionName,
-							null,
-							vscode.SymbolKind.Method,
-							createRange(7, 28),
-							createRange(7, 28))),
-							"vscode.executeDocumentSymbolProvider failed to provide symbol for static function: " + staticFunctionName);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute document symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentSymbolProvider includes static property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentSymbolProvider", uri)
-				.then((symbols: vscode.DocumentSymbol[]) =>
-					{
-						let staticPropertyName = "staticProperty";
-						assert.ok(findDocumentSymbol(symbols, new vscode.DocumentSymbol(
-							staticPropertyName,
-							null,
-							vscode.SymbolKind.Property,
-							createRange(11, 29),
-							createRange(11, 29))),
-							"vscode.executeDocumentSymbolProvider failed to provide symbol for static variable: " + staticPropertyName);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute document symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentSymbolProvider includes internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentSymbolProvider", uri)
-				.then((symbols: vscode.DocumentSymbol[]) =>
-					{
-						let className = "MainInternalClass";
-						assert.ok(findDocumentSymbol(symbols, new vscode.DocumentSymbol(
-							className,
-							null,
-							vscode.SymbolKind.Class,
-							createRange(34, 6),
-							createRange(34, 6))),
-							"vscode.executeDocumentSymbolProvider failed to provide symbol for internal class: " + className);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute document symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentSymbolProvider includes member variable in internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentSymbolProvider", uri)
-				.then((symbols: vscode.DocumentSymbol[]) =>
-					{
-						let memberVarName = "internalClassMemberVar";
-						assert.ok(findDocumentSymbol(symbols, new vscode.DocumentSymbol(
-							memberVarName,
-							null,
-							vscode.SymbolKind.Field,
-							createRange(36, 13),
-							createRange(36, 13))),
-							"vscode.executeDocumentSymbolProvider failed to provide symbol for member variable in internal class: " + memberVarName);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute document symbol provider: " + uri);
-					});
-		});
-	});
+suite("document symbol provider: Application workspace", () => {
+  suiteTeardown(revertAndCloseAllEditors);
+  test("vscode.executeDocumentSymbolProvider not empty", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDocumentSymbolProvider", uri)
+        .then(
+          (symbols: vscode.DocumentSymbol[]) => {
+            assert.notStrictEqual(
+              symbols.length,
+              0,
+              "vscode.executeDocumentSymbolProvider failed to provide symbols in text document: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute document symbol provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentSymbolProvider includes class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDocumentSymbolProvider", uri)
+        .then(
+          (symbols: vscode.DocumentSymbol[]) => {
+            let className = "Main";
+            assert.ok(
+              findDocumentSymbol(
+                symbols,
+                new vscode.DocumentSymbol(
+                  className,
+                  null,
+                  vscode.SymbolKind.Class,
+                  createRange(2, 14),
+                  createRange(2, 14)
+                )
+              ),
+              "vscode.executeDocumentSymbolProvider failed to provide symbol for class: " +
+                className
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute document symbol provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentSymbolProvider includes constructor", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDocumentSymbolProvider", uri)
+        .then(
+          (symbols: vscode.DocumentSymbol[]) => {
+            let className = "Main";
+            assert.ok(
+              findDocumentSymbol(
+                symbols,
+                new vscode.DocumentSymbol(
+                  className,
+                  null,
+                  vscode.SymbolKind.Constructor,
+                  createRange(16, 18),
+                  createRange(16, 18)
+                )
+              ),
+              "vscode.executeDocumentSymbolProvider failed to provide symbol for constructor: " +
+                className
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute document symbol provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentSymbolProvider includes member variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDocumentSymbolProvider", uri)
+        .then(
+          (symbols: vscode.DocumentSymbol[]) => {
+            let memberVarName = "memberVar";
+            assert.ok(
+              findDocumentSymbol(
+                symbols,
+                new vscode.DocumentSymbol(
+                  memberVarName,
+                  null,
+                  vscode.SymbolKind.Field,
+                  createRange(21, 13),
+                  createRange(21, 13)
+                )
+              ),
+              "vscode.executeDocumentSymbolProvider failed to provide symbol for member variable: " +
+                memberVarName
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute document symbol provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentSymbolProvider includes member function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDocumentSymbolProvider", uri)
+        .then(
+          (symbols: vscode.DocumentSymbol[]) => {
+            let memberFunctionName = "memberFunction";
+            assert.ok(
+              findDocumentSymbol(
+                symbols,
+                new vscode.DocumentSymbol(
+                  memberFunctionName,
+                  null,
+                  vscode.SymbolKind.Method,
+                  createRange(23, 19),
+                  createRange(23, 19)
+                )
+              ),
+              "vscode.executeDocumentSymbolProvider failed to provide symbol for member function: " +
+                memberFunctionName
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute document symbol provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentSymbolProvider includes member property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDocumentSymbolProvider", uri)
+        .then(
+          (symbols: vscode.DocumentSymbol[]) => {
+            let memberPropertyName = "memberProperty";
+            assert.ok(
+              findDocumentSymbol(
+                symbols,
+                new vscode.DocumentSymbol(
+                  memberPropertyName,
+                  null,
+                  vscode.SymbolKind.Property,
+                  createRange(27, 22),
+                  createRange(27, 22)
+                )
+              ),
+              "vscode.executeDocumentSymbolProvider failed to provide symbol for member variable: " +
+                memberPropertyName
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute document symbol provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentSymbolProvider includes static variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDocumentSymbolProvider", uri)
+        .then(
+          (symbols: vscode.DocumentSymbol[]) => {
+            let staticVarName = "staticVar";
+            assert.ok(
+              findDocumentSymbol(
+                symbols,
+                new vscode.DocumentSymbol(
+                  staticVarName,
+                  null,
+                  vscode.SymbolKind.Field,
+                  createRange(4, 21),
+                  createRange(4, 21)
+                )
+              ),
+              "vscode.executeDocumentSymbolProvider failed to provide symbol for static variable: " +
+                staticVarName
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute document symbol provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentSymbolProvider includes static constant", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDocumentSymbolProvider", uri)
+        .then(
+          (symbols: vscode.DocumentSymbol[]) => {
+            let staticConstName = "STATIC_CONST";
+            assert.ok(
+              findDocumentSymbol(
+                symbols,
+                new vscode.DocumentSymbol(
+                  staticConstName,
+                  null,
+                  vscode.SymbolKind.Constant,
+                  createRange(5, 22),
+                  createRange(5, 22)
+                )
+              ),
+              "vscode.executeDocumentSymbolProvider failed to provide symbol for static constant: " +
+                staticConstName
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute document symbol provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentSymbolProvider includes static function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDocumentSymbolProvider", uri)
+        .then(
+          (symbols: vscode.DocumentSymbol[]) => {
+            let staticFunctionName = "staticFunction";
+            assert.ok(
+              findDocumentSymbol(
+                symbols,
+                new vscode.DocumentSymbol(
+                  staticFunctionName,
+                  null,
+                  vscode.SymbolKind.Method,
+                  createRange(7, 28),
+                  createRange(7, 28)
+                )
+              ),
+              "vscode.executeDocumentSymbolProvider failed to provide symbol for static function: " +
+                staticFunctionName
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute document symbol provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentSymbolProvider includes static property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDocumentSymbolProvider", uri)
+        .then(
+          (symbols: vscode.DocumentSymbol[]) => {
+            let staticPropertyName = "staticProperty";
+            assert.ok(
+              findDocumentSymbol(
+                symbols,
+                new vscode.DocumentSymbol(
+                  staticPropertyName,
+                  null,
+                  vscode.SymbolKind.Property,
+                  createRange(11, 29),
+                  createRange(11, 29)
+                )
+              ),
+              "vscode.executeDocumentSymbolProvider failed to provide symbol for static variable: " +
+                staticPropertyName
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute document symbol provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentSymbolProvider includes internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDocumentSymbolProvider", uri)
+        .then(
+          (symbols: vscode.DocumentSymbol[]) => {
+            let className = "MainInternalClass";
+            assert.ok(
+              findDocumentSymbol(
+                symbols,
+                new vscode.DocumentSymbol(
+                  className,
+                  null,
+                  vscode.SymbolKind.Class,
+                  createRange(34, 6),
+                  createRange(34, 6)
+                )
+              ),
+              "vscode.executeDocumentSymbolProvider failed to provide symbol for internal class: " +
+                className
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute document symbol provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentSymbolProvider includes member variable in internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDocumentSymbolProvider", uri)
+        .then(
+          (symbols: vscode.DocumentSymbol[]) => {
+            let memberVarName = "internalClassMemberVar";
+            assert.ok(
+              findDocumentSymbol(
+                symbols,
+                new vscode.DocumentSymbol(
+                  memberVarName,
+                  null,
+                  vscode.SymbolKind.Field,
+                  createRange(36, 13),
+                  createRange(36, 13)
+                )
+              ),
+              "vscode.executeDocumentSymbolProvider failed to provide symbol for member variable in internal class: " +
+                memberVarName
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute document symbol provider: " + uri);
+          }
+        );
+    });
+  });
 });
 
-suite("workspace symbol provider: Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeWorkspaceSymbolProvider includes class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let query = "Main";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(
-							query,
-							vscode.SymbolKind.Class,
-							createRange(2, 14),
-							uri,
-							"No Package")),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for class: " + query);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeWorkspaceSymbolProvider includes constructor", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let query = "Main";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(
-							query,
-							vscode.SymbolKind.Constructor,
-							createRange(16, 18),
-							uri,
-							"Main")),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for constructor: " + query);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeWorkspaceSymbolProvider includes class in package", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let query = "PackageClass";
-		let packageName = "com.example";
-		let classUri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "PackageClass.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(
-							query,
-							vscode.SymbolKind.Class,
-							createRange(2, 14),
-							classUri,
-							packageName)),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for class: " + query);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeWorkspaceSymbolProvider includes member variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let query = "memberVar";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(
-							query,
-							vscode.SymbolKind.Field,
-							createRange(21, 13),
-							uri,
-							"Main")),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for member variable: " + query);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeWorkspaceSymbolProvider includes member function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let query = "memberFunction";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(
-							query,
-							vscode.SymbolKind.Method,
-							createRange(23, 19),
-							uri,
-							"Main")),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for member function: " + query);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeWorkspaceSymbolProvider includes member property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let query = "memberProperty";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(
-							query,
-							vscode.SymbolKind.Property,
-							createRange(27, 22),
-							uri,
-							"Main")),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for member property: " + query);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeWorkspaceSymbolProvider includes static variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let query = "staticVar";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(
-							query,
-							vscode.SymbolKind.Field,
-							createRange(4, 21),
-							uri,
-							"Main")),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for static variable: " + query);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeWorkspaceSymbolProvider includes static constant", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let query = "STATIC_CONST";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(
-							query,
-							vscode.SymbolKind.Constant,
-							createRange(5, 22),
-							uri,
-							"Main")),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for static constant: " + query);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeWorkspaceSymbolProvider includes static function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let query = "staticFunction";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(
-							query,
-							vscode.SymbolKind.Method,
-							createRange(7, 28),
-							uri,
-							"Main")),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for static function: " + query);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeWorkspaceSymbolProvider includes static property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let query = "staticProperty";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(
-							query,
-							vscode.SymbolKind.Property,
-							createRange(11, 29),
-							uri,
-							"Main")),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for static property: " + query);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeWorkspaceSymbolProvider includes internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let query = "MainInternalClass";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(
-							query,
-							vscode.SymbolKind.Class,
-							createRange(34, 6),
-							uri,
-							"No Package")),
-							"vscode.executeWorkspaceSymbolProvider did not provide internal class");
-							
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeWorkspaceSymbolProvider includes member variable in internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let query = "internalClassMemberVar";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(
-							query,
-							vscode.SymbolKind.Field,
-							createRange(36, 13),
-							uri,
-							"MainInternalClass")),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for member variable in internal class: " + query);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeWorkspaceSymbolProvider includes symbols in unreferenced files", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let query = "Unreferenced";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let qualifiedClassName = "com.example.UnreferencedClass";
-			let classUri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "UnreferencedClass.as"));
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.notStrictEqual(symbols.length, 0,
-							"vscode.executeWorkspaceSymbolProvider failed to provide unreferenced symbols for query: " + query);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeWorkspaceSymbolProvider includes class in unreferenced file", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let query = "Unreferenced";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let symbolName = "UnreferencedClass";
-			let packageName = "com.example";
-			let classUri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "UnreferencedClass.as"));
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(symbolName,
-							vscode.SymbolKind.Class,
-							createRange(2, 14),
-							classUri,
-							packageName)),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for class in unreferenced file with query: " + query);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeWorkspaceSymbolProvider includes constructor in unreferenced file", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let query = "Unreferenced";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let symbolName = "UnreferencedClass";
-			let packageName = "com.example";
-			let classUri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "UnreferencedClass.as"));
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(symbolName,
-							vscode.SymbolKind.Constructor,
-							createRange(4, 18),
-							classUri,
-							packageName)),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for constructor in unreferenced file with query: " + query);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeWorkspaceSymbolProvider includes interface in unreferenced file", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let query = "Unreferenced";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let symbolName = "UnreferencedInterface";
-			let packageName = "com.example.core";
-			let interfaceUri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "core", "UnreferencedInterface.as"));
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(symbolName,
-							vscode.SymbolKind.Interface,
-							createRange(2, 18),
-							interfaceUri,
-							packageName)),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for interface in unreferenced file with query: " + query);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeWorkspaceSymbolProvider includes class with camel-case shorthand", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-		let resultUri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "workspaceSymbols", "WSFindMe1.as"));
-		let query = "WFiMe";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(
-							"WSFindMe1",
-							vscode.SymbolKind.Class,
-							createRange(2, 14),
-							resultUri,
-							"com.example.workspaceSymbols")),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for class: " + query);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
+suite("workspace symbol provider: Application workspace", () => {
+  suiteTeardown(revertAndCloseAllEditors);
+  test("vscode.executeWorkspaceSymbolProvider includes class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let query = "Main";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  query,
+                  vscode.SymbolKind.Class,
+                  createRange(2, 14),
+                  uri,
+                  "No Package"
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for class: " +
+                query
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeWorkspaceSymbolProvider includes constructor", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let query = "Main";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  query,
+                  vscode.SymbolKind.Constructor,
+                  createRange(16, 18),
+                  uri,
+                  "Main"
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for constructor: " +
+                query
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeWorkspaceSymbolProvider includes class in package", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let query = "PackageClass";
+    let packageName = "com.example";
+    let classUri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "PackageClass.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  query,
+                  vscode.SymbolKind.Class,
+                  createRange(2, 14),
+                  classUri,
+                  packageName
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for class: " +
+                query
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeWorkspaceSymbolProvider includes member variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let query = "memberVar";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  query,
+                  vscode.SymbolKind.Field,
+                  createRange(21, 13),
+                  uri,
+                  "Main"
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for member variable: " +
+                query
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeWorkspaceSymbolProvider includes member function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let query = "memberFunction";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  query,
+                  vscode.SymbolKind.Method,
+                  createRange(23, 19),
+                  uri,
+                  "Main"
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for member function: " +
+                query
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeWorkspaceSymbolProvider includes member property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let query = "memberProperty";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  query,
+                  vscode.SymbolKind.Property,
+                  createRange(27, 22),
+                  uri,
+                  "Main"
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for member property: " +
+                query
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeWorkspaceSymbolProvider includes static variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let query = "staticVar";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  query,
+                  vscode.SymbolKind.Field,
+                  createRange(4, 21),
+                  uri,
+                  "Main"
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for static variable: " +
+                query
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeWorkspaceSymbolProvider includes static constant", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let query = "STATIC_CONST";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  query,
+                  vscode.SymbolKind.Constant,
+                  createRange(5, 22),
+                  uri,
+                  "Main"
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for static constant: " +
+                query
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeWorkspaceSymbolProvider includes static function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let query = "staticFunction";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  query,
+                  vscode.SymbolKind.Method,
+                  createRange(7, 28),
+                  uri,
+                  "Main"
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for static function: " +
+                query
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeWorkspaceSymbolProvider includes static property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let query = "staticProperty";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  query,
+                  vscode.SymbolKind.Property,
+                  createRange(11, 29),
+                  uri,
+                  "Main"
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for static property: " +
+                query
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeWorkspaceSymbolProvider includes internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let query = "MainInternalClass";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  query,
+                  vscode.SymbolKind.Class,
+                  createRange(34, 6),
+                  uri,
+                  "No Package"
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider did not provide internal class"
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeWorkspaceSymbolProvider includes member variable in internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let query = "internalClassMemberVar";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  query,
+                  vscode.SymbolKind.Field,
+                  createRange(36, 13),
+                  uri,
+                  "MainInternalClass"
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for member variable in internal class: " +
+                query
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeWorkspaceSymbolProvider includes symbols in unreferenced files", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let query = "Unreferenced";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let qualifiedClassName = "com.example.UnreferencedClass";
+      let classUri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "com",
+          "example",
+          "UnreferencedClass.as"
+        )
+      );
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.notStrictEqual(
+              symbols.length,
+              0,
+              "vscode.executeWorkspaceSymbolProvider failed to provide unreferenced symbols for query: " +
+                query
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeWorkspaceSymbolProvider includes class in unreferenced file", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let query = "Unreferenced";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let symbolName = "UnreferencedClass";
+      let packageName = "com.example";
+      let classUri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "com",
+          "example",
+          "UnreferencedClass.as"
+        )
+      );
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  symbolName,
+                  vscode.SymbolKind.Class,
+                  createRange(2, 14),
+                  classUri,
+                  packageName
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for class in unreferenced file with query: " +
+                query
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeWorkspaceSymbolProvider includes constructor in unreferenced file", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let query = "Unreferenced";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let symbolName = "UnreferencedClass";
+      let packageName = "com.example";
+      let classUri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "com",
+          "example",
+          "UnreferencedClass.as"
+        )
+      );
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  symbolName,
+                  vscode.SymbolKind.Constructor,
+                  createRange(4, 18),
+                  classUri,
+                  packageName
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for constructor in unreferenced file with query: " +
+                query
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeWorkspaceSymbolProvider includes interface in unreferenced file", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let query = "Unreferenced";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let symbolName = "UnreferencedInterface";
+      let packageName = "com.example.core";
+      let interfaceUri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "com",
+          "example",
+          "core",
+          "UnreferencedInterface.as"
+        )
+      );
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  symbolName,
+                  vscode.SymbolKind.Interface,
+                  createRange(2, 18),
+                  interfaceUri,
+                  packageName
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for interface in unreferenced file with query: " +
+                query
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeWorkspaceSymbolProvider includes class with camel-case shorthand", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
+    let resultUri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "workspaceSymbols",
+        "WSFindMe1.as"
+      )
+    );
+    let query = "WFiMe";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  "WSFindMe1",
+                  vscode.SymbolKind.Class,
+                  createRange(2, 14),
+                  resultUri,
+                  "com.example.workspaceSymbols"
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for class: " +
+                query
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
 });
 
-suite("signature help provider: Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeSignatureHelpProvider provides help for local function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "SignatureHelp.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeSignatureHelpProvider",
-				uri, new vscode.Position(19, 17), "(")
-				.then((signatureHelp: vscode.SignatureHelp) =>
-					{
-						assert.strictEqual(signatureHelp.signatures.length, 1,
-							"Signature help not provided for local function");
-						assert.strictEqual(signatureHelp.activeSignature, 0,
-							"Active signature incorrect for local function");
-						assert.strictEqual(signatureHelp.activeParameter, 0,
-							"Active parameter incorrect for local function");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeSignatureHelpProvider provides help for member function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "SignatureHelp.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeSignatureHelpProvider",
-				uri, new vscode.Position(20, 18), "(")
-				.then((signatureHelp: vscode.SignatureHelp) =>
-					{
-						assert.strictEqual(signatureHelp.signatures.length, 1,
-							"Signature help not provided for member function");
-						assert.strictEqual(signatureHelp.activeSignature, 0,
-							"Active signature incorrect for member function");
-						assert.strictEqual(signatureHelp.activeParameter, 0,
-							"Active parameter incorrect for member function");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeSignatureHelpProvider provides help for member function with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "SignatureHelp.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeSignatureHelpProvider",
-				uri, new vscode.Position(21, 23), "(")
-				.then((signatureHelp: vscode.SignatureHelp) =>
-					{
-						assert.strictEqual(signatureHelp.signatures.length, 1,
-							"Signature help not provided for member function with member access operator on this");
-						assert.strictEqual(signatureHelp.activeSignature, 0,
-							"Active signature incorrect for member function with member access operator on this");
-						assert.strictEqual(signatureHelp.activeParameter, 0,
-							"Active parameter incorrect for member function with member access operator on this");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeSignatureHelpProvider provides help for static function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "SignatureHelp.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeSignatureHelpProvider",
-				uri, new vscode.Position(22, 18), "(")
-				.then((signatureHelp: vscode.SignatureHelp) =>
-					{
-						assert.strictEqual(signatureHelp.signatures.length, 1,
-							"Signature help not provided for static function");
-						assert.strictEqual(signatureHelp.activeSignature, 0,
-							"Active signature incorrect for static function");
-						assert.strictEqual(signatureHelp.activeParameter, 0,
-							"Active parameter incorrect for static function");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeSignatureHelpProvider provides help for static function with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "SignatureHelp.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeSignatureHelpProvider",
-				uri, new vscode.Position(23, 32), "(")
-				.then((signatureHelp: vscode.SignatureHelp) =>
-					{
-						assert.strictEqual(signatureHelp.signatures.length, 1,
-							"Signature help not provided for static function with member access operator on class");
-						assert.strictEqual(signatureHelp.activeSignature, 0,
-							"Active signature incorrect for static function with member access operator on class");
-						assert.strictEqual(signatureHelp.activeParameter, 0,
-							"Active parameter incorrect for static function with member access operator on class");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeSignatureHelpProvider provides help for package function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "SignatureHelp.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeSignatureHelpProvider",
-				uri, new vscode.Position(24, 19), "(")
-				.then((signatureHelp: vscode.SignatureHelp) =>
-					{
-						assert.strictEqual(signatureHelp.signatures.length, 1,
-							"Signature help not provided for package function");
-						assert.strictEqual(signatureHelp.activeSignature, 0,
-							"Active signature incorrect for package function");
-						assert.strictEqual(signatureHelp.activeParameter, 0,
-							"Active parameter incorrect for package function");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeSignatureHelpProvider provides help for fully-qualified package function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "SignatureHelp.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeSignatureHelpProvider",
-				uri, new vscode.Position(25, 31), "(")
-				.then((signatureHelp: vscode.SignatureHelp) =>
-					{
-						assert.strictEqual(signatureHelp.signatures.length, 1,
-							"Signature help not provided for fully-qualified package function");
-						assert.strictEqual(signatureHelp.activeSignature, 0,
-							"Active signature incorrect for fully-qualified package function");
-						assert.strictEqual(signatureHelp.activeParameter, 0,
-							"Active parameter incorrect for fully-qualified package function");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeSignatureHelpProvider provides help for internal function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "SignatureHelp.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeSignatureHelpProvider",
-				uri, new vscode.Position(26, 20), "(")
-				.then((signatureHelp: vscode.SignatureHelp) =>
-					{
-						assert.strictEqual(signatureHelp.signatures.length, 1,
-							"Signature help not provided for internal function");
-						assert.strictEqual(signatureHelp.activeSignature, 0,
-							"Active signature incorrect for internal function");
-						assert.strictEqual(signatureHelp.activeParameter, 0,
-							"Active parameter incorrect for internal function");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeSignatureHelpProvider provides help for super constructor", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "SignatureHelp.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeSignatureHelpProvider",
-				uri, new vscode.Position(27, 9), "(")
-				.then((signatureHelp: vscode.SignatureHelp) =>
-					{
-						assert.strictEqual(signatureHelp.signatures.length, 1,
-							"Signature help not provided for super constructor");
-						assert.strictEqual(signatureHelp.activeSignature, 0,
-							"Active signature incorrect for super constructor");
-						assert.strictEqual(signatureHelp.activeParameter, 0,
-							"Active parameter incorrect for super constructor");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeSignatureHelpProvider provides help for super member method", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "SignatureHelp.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeSignatureHelpProvider",
-				uri, new vscode.Position(28, 27), "(")
-				.then((signatureHelp: vscode.SignatureHelp) =>
-					{
-						assert.strictEqual(signatureHelp.signatures.length, 1,
-							"Signature help not provided for super member method");
-						assert.strictEqual(signatureHelp.activeSignature, 0,
-							"Active signature incorrect for super member method");
-						assert.strictEqual(signatureHelp.activeParameter, 0,
-							"Active parameter incorrect for super member method");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeSignatureHelpProvider must not provide help for private super member method", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "SignatureHelp.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeSignatureHelpProvider",
-				uri, new vscode.Position(29, 34), "(")
-				.then((signatureHelp: vscode.SignatureHelp) =>
-					{
-						assert.strictEqual(signatureHelp.signatures.length, 0,
-							"Signature help incorrectly provided for private super member method");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeSignatureHelpProvider provides help for constructor of new instance", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "SignatureHelp.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeSignatureHelpProvider",
-				uri, new vscode.Position(30, 25), "(")
-				.then((signatureHelp: vscode.SignatureHelp) =>
-					{
-						assert.strictEqual(signatureHelp.signatures.length, 1,
-							"Signature help not provided for constructor of new instance");
-						assert.strictEqual(signatureHelp.activeSignature, 0,
-							"Active signature incorrect for constructor of new instance");
-						assert.strictEqual(signatureHelp.activeParameter, 0,
-							"Active parameter incorrect for constructor of new instance");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
+suite("signature help provider: Application workspace", () => {
+  suiteTeardown(revertAndCloseAllEditors);
+  test("vscode.executeSignatureHelpProvider provides help for local function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "SignatureHelp.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeSignatureHelpProvider",
+          uri,
+          new vscode.Position(19, 17),
+          "("
+        )
+        .then(
+          (signatureHelp: vscode.SignatureHelp) => {
+            assert.strictEqual(
+              signatureHelp.signatures.length,
+              1,
+              "Signature help not provided for local function"
+            );
+            assert.strictEqual(
+              signatureHelp.activeSignature,
+              0,
+              "Active signature incorrect for local function"
+            );
+            assert.strictEqual(
+              signatureHelp.activeParameter,
+              0,
+              "Active parameter incorrect for local function"
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeSignatureHelpProvider provides help for member function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "SignatureHelp.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeSignatureHelpProvider",
+          uri,
+          new vscode.Position(20, 18),
+          "("
+        )
+        .then(
+          (signatureHelp: vscode.SignatureHelp) => {
+            assert.strictEqual(
+              signatureHelp.signatures.length,
+              1,
+              "Signature help not provided for member function"
+            );
+            assert.strictEqual(
+              signatureHelp.activeSignature,
+              0,
+              "Active signature incorrect for member function"
+            );
+            assert.strictEqual(
+              signatureHelp.activeParameter,
+              0,
+              "Active parameter incorrect for member function"
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeSignatureHelpProvider provides help for member function with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "SignatureHelp.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeSignatureHelpProvider",
+          uri,
+          new vscode.Position(21, 23),
+          "("
+        )
+        .then(
+          (signatureHelp: vscode.SignatureHelp) => {
+            assert.strictEqual(
+              signatureHelp.signatures.length,
+              1,
+              "Signature help not provided for member function with member access operator on this"
+            );
+            assert.strictEqual(
+              signatureHelp.activeSignature,
+              0,
+              "Active signature incorrect for member function with member access operator on this"
+            );
+            assert.strictEqual(
+              signatureHelp.activeParameter,
+              0,
+              "Active parameter incorrect for member function with member access operator on this"
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeSignatureHelpProvider provides help for static function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "SignatureHelp.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeSignatureHelpProvider",
+          uri,
+          new vscode.Position(22, 18),
+          "("
+        )
+        .then(
+          (signatureHelp: vscode.SignatureHelp) => {
+            assert.strictEqual(
+              signatureHelp.signatures.length,
+              1,
+              "Signature help not provided for static function"
+            );
+            assert.strictEqual(
+              signatureHelp.activeSignature,
+              0,
+              "Active signature incorrect for static function"
+            );
+            assert.strictEqual(
+              signatureHelp.activeParameter,
+              0,
+              "Active parameter incorrect for static function"
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeSignatureHelpProvider provides help for static function with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "SignatureHelp.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeSignatureHelpProvider",
+          uri,
+          new vscode.Position(23, 32),
+          "("
+        )
+        .then(
+          (signatureHelp: vscode.SignatureHelp) => {
+            assert.strictEqual(
+              signatureHelp.signatures.length,
+              1,
+              "Signature help not provided for static function with member access operator on class"
+            );
+            assert.strictEqual(
+              signatureHelp.activeSignature,
+              0,
+              "Active signature incorrect for static function with member access operator on class"
+            );
+            assert.strictEqual(
+              signatureHelp.activeParameter,
+              0,
+              "Active parameter incorrect for static function with member access operator on class"
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeSignatureHelpProvider provides help for package function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "SignatureHelp.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeSignatureHelpProvider",
+          uri,
+          new vscode.Position(24, 19),
+          "("
+        )
+        .then(
+          (signatureHelp: vscode.SignatureHelp) => {
+            assert.strictEqual(
+              signatureHelp.signatures.length,
+              1,
+              "Signature help not provided for package function"
+            );
+            assert.strictEqual(
+              signatureHelp.activeSignature,
+              0,
+              "Active signature incorrect for package function"
+            );
+            assert.strictEqual(
+              signatureHelp.activeParameter,
+              0,
+              "Active parameter incorrect for package function"
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeSignatureHelpProvider provides help for fully-qualified package function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "SignatureHelp.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeSignatureHelpProvider",
+          uri,
+          new vscode.Position(25, 31),
+          "("
+        )
+        .then(
+          (signatureHelp: vscode.SignatureHelp) => {
+            assert.strictEqual(
+              signatureHelp.signatures.length,
+              1,
+              "Signature help not provided for fully-qualified package function"
+            );
+            assert.strictEqual(
+              signatureHelp.activeSignature,
+              0,
+              "Active signature incorrect for fully-qualified package function"
+            );
+            assert.strictEqual(
+              signatureHelp.activeParameter,
+              0,
+              "Active parameter incorrect for fully-qualified package function"
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeSignatureHelpProvider provides help for internal function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "SignatureHelp.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeSignatureHelpProvider",
+          uri,
+          new vscode.Position(26, 20),
+          "("
+        )
+        .then(
+          (signatureHelp: vscode.SignatureHelp) => {
+            assert.strictEqual(
+              signatureHelp.signatures.length,
+              1,
+              "Signature help not provided for internal function"
+            );
+            assert.strictEqual(
+              signatureHelp.activeSignature,
+              0,
+              "Active signature incorrect for internal function"
+            );
+            assert.strictEqual(
+              signatureHelp.activeParameter,
+              0,
+              "Active parameter incorrect for internal function"
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeSignatureHelpProvider provides help for super constructor", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "SignatureHelp.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeSignatureHelpProvider",
+          uri,
+          new vscode.Position(27, 9),
+          "("
+        )
+        .then(
+          (signatureHelp: vscode.SignatureHelp) => {
+            assert.strictEqual(
+              signatureHelp.signatures.length,
+              1,
+              "Signature help not provided for super constructor"
+            );
+            assert.strictEqual(
+              signatureHelp.activeSignature,
+              0,
+              "Active signature incorrect for super constructor"
+            );
+            assert.strictEqual(
+              signatureHelp.activeParameter,
+              0,
+              "Active parameter incorrect for super constructor"
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeSignatureHelpProvider provides help for super member method", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "SignatureHelp.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeSignatureHelpProvider",
+          uri,
+          new vscode.Position(28, 27),
+          "("
+        )
+        .then(
+          (signatureHelp: vscode.SignatureHelp) => {
+            assert.strictEqual(
+              signatureHelp.signatures.length,
+              1,
+              "Signature help not provided for super member method"
+            );
+            assert.strictEqual(
+              signatureHelp.activeSignature,
+              0,
+              "Active signature incorrect for super member method"
+            );
+            assert.strictEqual(
+              signatureHelp.activeParameter,
+              0,
+              "Active parameter incorrect for super member method"
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeSignatureHelpProvider must not provide help for private super member method", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "SignatureHelp.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeSignatureHelpProvider",
+          uri,
+          new vscode.Position(29, 34),
+          "("
+        )
+        .then(
+          (signatureHelp: vscode.SignatureHelp) => {
+            assert.strictEqual(
+              signatureHelp.signatures.length,
+              0,
+              "Signature help incorrectly provided for private super member method"
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
+  test("vscode.executeSignatureHelpProvider provides help for constructor of new instance", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "SignatureHelp.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeSignatureHelpProvider",
+          uri,
+          new vscode.Position(30, 25),
+          "("
+        )
+        .then(
+          (signatureHelp: vscode.SignatureHelp) => {
+            assert.strictEqual(
+              signatureHelp.signatures.length,
+              1,
+              "Signature help not provided for constructor of new instance"
+            );
+            assert.strictEqual(
+              signatureHelp.activeSignature,
+              0,
+              "Active signature incorrect for constructor of new instance"
+            );
+            assert.strictEqual(
+              signatureHelp.activeParameter,
+              0,
+              "Active parameter incorrect for constructor of new instance"
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
 });
 
-suite("definition provider: Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeDefinitionProvider finds definition of local variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(90, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of local variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for local variable definition");
-						assert.strictEqual(location.range.start.line, 42, "vscode.executeDefinitionProvider provided incorrect line for local variable definition");
-						assert.strictEqual(location.range.start.character, 7, "vscode.executeDefinitionProvider provided incorrect character for local variable definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of local function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(92, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of local function definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for local function definition");
-						assert.strictEqual(location.range.start.line, 43, "vscode.executeDefinitionProvider provided incorrect line for local function definition");
-						assert.strictEqual(location.range.start.character, 12, "vscode.executeDefinitionProvider provided incorrect character for local function definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of member variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(54, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of member variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for member variable definition");
-						assert.strictEqual(location.range.start.line, 14, "vscode.executeDefinitionProvider provided incorrect line for member variable definition");
-						assert.strictEqual(location.range.start.character, 14, "vscode.executeDefinitionProvider provided incorrect character for member variable definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of member variable with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(55, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of member variable definition with member access operator on this: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for member variable definition with member access operator on this");
-						assert.strictEqual(location.range.start.line, 14, "vscode.executeDefinitionProvider provided incorrect line for member variable definition with member access operator on this");
-						assert.strictEqual(location.range.start.character, 14, "vscode.executeDefinitionProvider provided incorrect character for member variable definition with member access operator on this");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of member function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(45, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of member function definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for member function definition");
-						assert.strictEqual(location.range.start.line, 16, "vscode.executeDefinitionProvider provided incorrect line for member function definition");
-						assert.strictEqual(location.range.start.character, 19, "vscode.executeDefinitionProvider provided incorrect character for member function definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of member function with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(46, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of member function definition with member access operator on this: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for member function definition with member access operator on this");
-						assert.strictEqual(location.range.start.line, 16, "vscode.executeDefinitionProvider provided incorrect line for member function definition with member access operator on this");
-						assert.strictEqual(location.range.start.character, 19, "vscode.executeDefinitionProvider provided incorrect character for member function definition with member access operator on this");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of member property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(57, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of member property definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for member property definition");
-						assert.strictEqual(location.range.start.line, 20, "vscode.executeDefinitionProvider provided incorrect line for member property definition");
-						assert.strictEqual(location.range.start.character, 22, "vscode.executeDefinitionProvider provided incorrect character for member property definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of member property with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(58, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of member property definition with member access operator on this: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for member property definition with member access operator on this");
-						assert.strictEqual(location.range.start.line, 20, "vscode.executeDefinitionProvider provided incorrect line for member property definition with member access operator on this");
-						assert.strictEqual(location.range.start.character, 22, "vscode.executeDefinitionProvider provided incorrect character for member property definition with member access operator on this");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of static variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(51, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of static variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for static variable definition");
-						assert.strictEqual(location.range.start.line, 8, "vscode.executeDefinitionProvider provided incorrect line for static variable definition");
-						assert.strictEqual(location.range.start.character, 20, "vscode.executeDefinitionProvider provided incorrect character for static variable definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of static variable with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(52, 17);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of static variable definition with member access operator on class: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for static variable definition with member access operator on class");
-						assert.strictEqual(location.range.start.line, 8, "vscode.executeDefinitionProvider provided incorrect line for static variable definition with member access operator on class");
-						assert.strictEqual(location.range.start.character, 20, "vscode.executeDefinitionProvider provided incorrect character for static variable definition with member access operator on class");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of static function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(48, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of static function definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for static function definition");
-						assert.strictEqual(location.range.start.line, 10, "vscode.executeDefinitionProvider provided incorrect line for static function definition");
-						assert.strictEqual(location.range.start.character, 26, "vscode.executeDefinitionProvider provided incorrect character for static function definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of static function with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(49, 17);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of static function definition with member access operator on class: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for static function definition with member access operator on class");
-						assert.strictEqual(location.range.start.line, 10, "vscode.executeDefinitionProvider provided incorrect line for static function definition with member access operator on class");
-						assert.strictEqual(location.range.start.character, 26, "vscode.executeDefinitionProvider provided incorrect character for static function definition with member access operator on class");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of static property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(60, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of static property definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for static property definition");
-						assert.strictEqual(location.range.start.line, 29, "vscode.executeDefinitionProvider provided incorrect line for static property definition");
-						assert.strictEqual(location.range.start.character, 29, "vscode.executeDefinitionProvider provided incorrect character for static property definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of static property with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(61, 17);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of static property definition with member access operator on class: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for static property definition with member access operator on class");
-						assert.strictEqual(location.range.start.line, 29, "vscode.executeDefinitionProvider provided incorrect line for static property definition with member access operator on class");
-						assert.strictEqual(location.range.start.character, 29, "vscode.executeDefinitionProvider provided incorrect character for static property definition with member access operator on class");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of package function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "packageFunction.as"));
-		let position = new vscode.Position(84, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of package function definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for package function definition");
-						assert.strictEqual(location.range.start.line, 2, "vscode.executeDefinitionProvider provided incorrect line for package function definition");
-						assert.strictEqual(location.range.start.character, 17, "vscode.executeDefinitionProvider provided incorrect character for package function definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of fully-qualified package function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "packageFunction.as"));
-		let position = new vscode.Position(85, 17);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of fully-qualified package function definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for fully-qualified package function definition");
-						assert.strictEqual(location.range.start.line, 2, "vscode.executeDefinitionProvider provided incorrect line for fully-qualified package function definition");
-						assert.strictEqual(location.range.start.character, 17, "vscode.executeDefinitionProvider provided incorrect character for fully-qualified package function definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of package variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "packageVar.as"));
-		let position = new vscode.Position(87, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of package variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for package variable definition");
-						assert.strictEqual(location.range.start.line, 2, "vscode.executeDefinitionProvider provided incorrect line for package variable definition");
-						assert.strictEqual(location.range.start.character, 12, "vscode.executeDefinitionProvider provided incorrect character for package variable definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of fully-qualified package variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "packageVar.as"));
-		let position = new vscode.Position(88, 17);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of fully-qualified package variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for fully-qualified package variable definition");
-						assert.strictEqual(location.range.start.line, 2, "vscode.executeDefinitionProvider provided incorrect line for fully-qualified package variable definition");
-						assert.strictEqual(location.range.start.character, 12, "vscode.executeDefinitionProvider provided incorrect character for fully-qualified package variable definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of super static variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(74, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of super static variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for super static variable definition");
-						assert.strictEqual(location.range.start.line, 4, "vscode.executeDefinitionProvider provided incorrect line for super static variable definition");
-						assert.strictEqual(location.range.start.character, 20, "vscode.executeDefinitionProvider provided incorrect character for super static variable definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of super static variable with member access operator on superclass", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(75, 22);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of super static variable definition with member access operator on superclass: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for super static variable definition with member access operator on superclass");
-						assert.strictEqual(location.range.start.line, 4, "vscode.executeDefinitionProvider provided incorrect line for super static variable definition with member access operator on superclass");
-						assert.strictEqual(location.range.start.character, 20, "vscode.executeDefinitionProvider provided incorrect character for super static variable definition with member access operator on superclass");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of super static property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(81, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of super static property definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for super static property definition");
-						assert.strictEqual(location.range.start.line, 6, "vscode.executeDefinitionProvider provided incorrect line for super static property definition");
-						assert.strictEqual(location.range.start.character, 29, "vscode.executeDefinitionProvider provided incorrect character for super static property definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of super static property with member access operator on superclass", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(82, 22);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of super static property definition with member access operator on superclass: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for super static property definition with member access operator on superclass");
-						assert.strictEqual(location.range.start.line, 6, "vscode.executeDefinitionProvider provided incorrect line for super static property definition with member access operator on superclass");
-						assert.strictEqual(location.range.start.character, 29, "vscode.executeDefinitionProvider provided incorrect character for super static property definition with member access operator on superclass");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of super static function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(67, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of super static function definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for super static function definition");
-						assert.strictEqual(location.range.start.line, 15, "vscode.executeDefinitionProvider provided incorrect line for super static function definition");
-						assert.strictEqual(location.range.start.character, 28, "vscode.executeDefinitionProvider provided incorrect character for super static function definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of super static function with member access operator on superclass", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(68, 22);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of super static function definition with member access operator on superclass: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for super static function definition with member access operator on superclass");
-						assert.strictEqual(location.range.start.line, 15, "vscode.executeDefinitionProvider provided incorrect line for super static function definition with member access operator on superclass");
-						assert.strictEqual(location.range.start.character, 28, "vscode.executeDefinitionProvider provided incorrect character for super static function definition with member access operator on superclass");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of super member function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(63, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of super member function definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for super member function definition");
-						assert.strictEqual(location.range.start.line, 30, "vscode.executeDefinitionProvider provided incorrect line for super member function definition");
-						assert.strictEqual(location.range.start.character, 21, "vscode.executeDefinitionProvider provided incorrect character for super member function definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of super member function with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(64, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of super member function definition with member access operator on this: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for super member function definition with member access operator on this");
-						assert.strictEqual(location.range.start.line, 30, "vscode.executeDefinitionProvider provided incorrect line for super member function definition with member access operator on this");
-						assert.strictEqual(location.range.start.character, 21, "vscode.executeDefinitionProvider provided incorrect character for super member function definition with member access operator on this");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of super member function with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(65, 11);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of super member function definition with member access operator on super: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for super member function definition with member access operator on super");
-						assert.strictEqual(location.range.start.line, 30, "vscode.executeDefinitionProvider provided incorrect line for super member function definition with member access operator on super");
-						assert.strictEqual(location.range.start.character, 21, "vscode.executeDefinitionProvider provided incorrect character for super member function definition with member access operator on super");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of super member variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(70, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of super member variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for super member variable definition");
-						assert.strictEqual(location.range.start.line, 19, "vscode.executeDefinitionProvider provided incorrect line for super member variable definition");
-						assert.strictEqual(location.range.start.character, 13, "vscode.executeDefinitionProvider provided incorrect character for super member variable definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of super member variable with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(71, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of super member variable definition with member access operator on this: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for super member variable definition with member access operator on this");
-						assert.strictEqual(location.range.start.line, 19, "vscode.executeDefinitionProvider provided incorrect line for super member variable definition with member access operator on this");
-						assert.strictEqual(location.range.start.character, 13, "vscode.executeDefinitionProvider provided incorrect character for super member variable definition with member access operator on this");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of super member variable with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(72, 11);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of super member variable definition with member access operator on super: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for super member variable definition with member access operator on super");
-						assert.strictEqual(location.range.start.line, 19, "vscode.executeDefinitionProvider provided incorrect line for super member variable definition with member access operator on super");
-						assert.strictEqual(location.range.start.character, 13, "vscode.executeDefinitionProvider provided incorrect character for super member variable definition with member access operator on super");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of super member property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(77, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of super member property definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for super member property definition");
-						assert.strictEqual(location.range.start.line, 21, "vscode.executeDefinitionProvider provided incorrect line for super member property definition");
-						assert.strictEqual(location.range.start.character, 22, "vscode.executeDefinitionProvider provided incorrect character for super member property definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of super member property with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(78, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of super member property definition with member access operator on this: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for super member property definition with member access operator on this");
-						assert.strictEqual(location.range.start.line, 21, "vscode.executeDefinitionProvider provided incorrect line for super member property definition with member access operator on this");
-						assert.strictEqual(location.range.start.character, 22, "vscode.executeDefinitionProvider provided incorrect character for super member property definition with member access operator on this");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of super member property with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(79, 11);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of super member property definition with member access operator on super: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for super member property definition with member access operator on super");
-						assert.strictEqual(location.range.start.line, 21, "vscode.executeDefinitionProvider provided incorrect line for super member property definition with member access operator on super");
-						assert.strictEqual(location.range.start.character, 22, "vscode.executeDefinitionProvider provided incorrect character for super member property definition with member access operator on super");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of constructor", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(107, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of super member property definition with member access operator on super: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), definitionURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for super member property definition with member access operator on super");
-						assert.strictEqual(location.range.start.line, 34, "vscode.executeDefinitionProvider provided incorrect line for super member property definition with member access operator on super");
-						assert.strictEqual(location.range.start.character, 18, "vscode.executeDefinitionProvider provided incorrect character for super member property definition with member access operator on super");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of file-internal variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(94, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of file-internal variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for file-internal variable definition");
-						assert.strictEqual(location.range.start.line, 113, "vscode.executeDefinitionProvider provided incorrect line for file-internal variable definition");
-						assert.strictEqual(location.range.start.character, 4, "vscode.executeDefinitionProvider provided incorrect character for file-internal variable definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of file-internal function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(95, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of file-internal function definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for file-internal function definition");
-						assert.strictEqual(location.range.start.line, 112, "vscode.executeDefinitionProvider provided incorrect line for file-internal function definition");
-						assert.strictEqual(location.range.start.character, 9, "vscode.executeDefinitionProvider provided incorrect character for file-internal function definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(97, 37);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of file-internal class definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for file-internal class definition");
-						assert.strictEqual(location.range.start.line, 115, "vscode.executeDefinitionProvider provided incorrect line for file-internal class definition");
-						assert.strictEqual(location.range.start.character, 6, "vscode.executeDefinitionProvider provided incorrect character for file-internal class definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of file-internal constructor", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(97, 64);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of file-internal class definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for file-internal class definition");
-						assert.strictEqual(location.range.start.line, 147, "vscode.executeDefinitionProvider provided incorrect line for file-internal class definition");
-						assert.strictEqual(location.range.start.character, 17, "vscode.executeDefinitionProvider provided incorrect character for file-internal class definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of file-internal member function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(99, 33);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of file-internal member function definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for file-internal member function definition");
-						assert.strictEqual(location.range.start.line, 143, "vscode.executeDefinitionProvider provided incorrect line for file-internal member function definition");
-						assert.strictEqual(location.range.start.character, 17, "vscode.executeDefinitionProvider provided incorrect character for file-internal member function definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of file-internal member variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(100, 33);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of file-internal member variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for file-internal member variable definition");
-						assert.strictEqual(location.range.start.line, 132, "vscode.executeDefinitionProvider provided incorrect line for file-internal member variable definition");
-						assert.strictEqual(location.range.start.character, 12, "vscode.executeDefinitionProvider provided incorrect character for file-internal member variable definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of file-internal member property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(101, 33);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of file-internal member property definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for file-internal member property definition");
-						assert.strictEqual(location.range.start.line, 134, "vscode.executeDefinitionProvider provided incorrect line for file-internal member property definition");
-						assert.strictEqual(location.range.start.character, 21, "vscode.executeDefinitionProvider provided incorrect character for file-internal member property definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of file-internal static property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(105, 25);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of file-internal static property definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for file-internal static property definition");
-						assert.strictEqual(location.range.start.line, 119, "vscode.executeDefinitionProvider provided incorrect line for file-internal static property definition");
-						assert.strictEqual(location.range.start.character, 28, "vscode.executeDefinitionProvider provided incorrect character for file-internal static property definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of file-internal static variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(104, 25);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of file-internal static variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for file-internal static variable definition");
-						assert.strictEqual(location.range.start.line, 117, "vscode.executeDefinitionProvider provided incorrect line for file-internal static variable definition");
-						assert.strictEqual(location.range.start.character, 19, "vscode.executeDefinitionProvider provided incorrect character for file-internal static variable definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of file-internal static function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(103, 25);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of file-internal static function definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for file-internal static function definition");
-						assert.strictEqual(location.range.start.line, 128, "vscode.executeDefinitionProvider provided incorrect line for file-internal static function definition");
-						assert.strictEqual(location.range.start.character, 24, "vscode.executeDefinitionProvider provided incorrect character for file-internal static function definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
+suite("definition provider: Application workspace", () => {
+  suiteTeardown(revertAndCloseAllEditors);
+  test("vscode.executeDefinitionProvider finds definition of local variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(90, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of local variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for local variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              42,
+              "vscode.executeDefinitionProvider provided incorrect line for local variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              7,
+              "vscode.executeDefinitionProvider provided incorrect character for local variable definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of local function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(92, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of local function definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for local function definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              43,
+              "vscode.executeDefinitionProvider provided incorrect line for local function definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              12,
+              "vscode.executeDefinitionProvider provided incorrect character for local function definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of member variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(54, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of member variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for member variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              14,
+              "vscode.executeDefinitionProvider provided incorrect line for member variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              14,
+              "vscode.executeDefinitionProvider provided incorrect character for member variable definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of member variable with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(55, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of member variable definition with member access operator on this: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for member variable definition with member access operator on this"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              14,
+              "vscode.executeDefinitionProvider provided incorrect line for member variable definition with member access operator on this"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              14,
+              "vscode.executeDefinitionProvider provided incorrect character for member variable definition with member access operator on this"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of member function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(45, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of member function definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for member function definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              16,
+              "vscode.executeDefinitionProvider provided incorrect line for member function definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              19,
+              "vscode.executeDefinitionProvider provided incorrect character for member function definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of member function with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(46, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of member function definition with member access operator on this: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for member function definition with member access operator on this"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              16,
+              "vscode.executeDefinitionProvider provided incorrect line for member function definition with member access operator on this"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              19,
+              "vscode.executeDefinitionProvider provided incorrect character for member function definition with member access operator on this"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of member property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(57, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of member property definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for member property definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              20,
+              "vscode.executeDefinitionProvider provided incorrect line for member property definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              22,
+              "vscode.executeDefinitionProvider provided incorrect character for member property definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of member property with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(58, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of member property definition with member access operator on this: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for member property definition with member access operator on this"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              20,
+              "vscode.executeDefinitionProvider provided incorrect line for member property definition with member access operator on this"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              22,
+              "vscode.executeDefinitionProvider provided incorrect character for member property definition with member access operator on this"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of static variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(51, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of static variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for static variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              8,
+              "vscode.executeDefinitionProvider provided incorrect line for static variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              20,
+              "vscode.executeDefinitionProvider provided incorrect character for static variable definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of static variable with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(52, 17);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of static variable definition with member access operator on class: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for static variable definition with member access operator on class"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              8,
+              "vscode.executeDefinitionProvider provided incorrect line for static variable definition with member access operator on class"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              20,
+              "vscode.executeDefinitionProvider provided incorrect character for static variable definition with member access operator on class"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of static function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(48, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of static function definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for static function definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              10,
+              "vscode.executeDefinitionProvider provided incorrect line for static function definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              26,
+              "vscode.executeDefinitionProvider provided incorrect character for static function definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of static function with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(49, 17);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of static function definition with member access operator on class: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for static function definition with member access operator on class"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              10,
+              "vscode.executeDefinitionProvider provided incorrect line for static function definition with member access operator on class"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              26,
+              "vscode.executeDefinitionProvider provided incorrect character for static function definition with member access operator on class"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of static property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(60, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of static property definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for static property definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              29,
+              "vscode.executeDefinitionProvider provided incorrect line for static property definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              29,
+              "vscode.executeDefinitionProvider provided incorrect character for static property definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of static property with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(61, 17);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of static property definition with member access operator on class: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for static property definition with member access operator on class"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              29,
+              "vscode.executeDefinitionProvider provided incorrect line for static property definition with member access operator on class"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              29,
+              "vscode.executeDefinitionProvider provided incorrect character for static property definition with member access operator on class"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of package function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "packageFunction.as"
+      )
+    );
+    let position = new vscode.Position(84, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of package function definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for package function definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              2,
+              "vscode.executeDefinitionProvider provided incorrect line for package function definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              17,
+              "vscode.executeDefinitionProvider provided incorrect character for package function definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of fully-qualified package function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "packageFunction.as"
+      )
+    );
+    let position = new vscode.Position(85, 17);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of fully-qualified package function definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for fully-qualified package function definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              2,
+              "vscode.executeDefinitionProvider provided incorrect line for fully-qualified package function definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              17,
+              "vscode.executeDefinitionProvider provided incorrect character for fully-qualified package function definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of package variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "packageVar.as"
+      )
+    );
+    let position = new vscode.Position(87, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of package variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for package variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              2,
+              "vscode.executeDefinitionProvider provided incorrect line for package variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              12,
+              "vscode.executeDefinitionProvider provided incorrect character for package variable definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of fully-qualified package variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "packageVar.as"
+      )
+    );
+    let position = new vscode.Position(88, 17);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of fully-qualified package variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for fully-qualified package variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              2,
+              "vscode.executeDefinitionProvider provided incorrect line for fully-qualified package variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              12,
+              "vscode.executeDefinitionProvider provided incorrect character for fully-qualified package variable definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of super static variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(74, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of super static variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for super static variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              4,
+              "vscode.executeDefinitionProvider provided incorrect line for super static variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              20,
+              "vscode.executeDefinitionProvider provided incorrect character for super static variable definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of super static variable with member access operator on superclass", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(75, 22);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of super static variable definition with member access operator on superclass: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for super static variable definition with member access operator on superclass"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              4,
+              "vscode.executeDefinitionProvider provided incorrect line for super static variable definition with member access operator on superclass"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              20,
+              "vscode.executeDefinitionProvider provided incorrect character for super static variable definition with member access operator on superclass"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of super static property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(81, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of super static property definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for super static property definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              6,
+              "vscode.executeDefinitionProvider provided incorrect line for super static property definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              29,
+              "vscode.executeDefinitionProvider provided incorrect character for super static property definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of super static property with member access operator on superclass", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(82, 22);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of super static property definition with member access operator on superclass: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for super static property definition with member access operator on superclass"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              6,
+              "vscode.executeDefinitionProvider provided incorrect line for super static property definition with member access operator on superclass"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              29,
+              "vscode.executeDefinitionProvider provided incorrect character for super static property definition with member access operator on superclass"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of super static function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(67, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of super static function definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for super static function definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              15,
+              "vscode.executeDefinitionProvider provided incorrect line for super static function definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              28,
+              "vscode.executeDefinitionProvider provided incorrect character for super static function definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of super static function with member access operator on superclass", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(68, 22);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of super static function definition with member access operator on superclass: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for super static function definition with member access operator on superclass"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              15,
+              "vscode.executeDefinitionProvider provided incorrect line for super static function definition with member access operator on superclass"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              28,
+              "vscode.executeDefinitionProvider provided incorrect character for super static function definition with member access operator on superclass"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of super member function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(63, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of super member function definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for super member function definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              30,
+              "vscode.executeDefinitionProvider provided incorrect line for super member function definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              21,
+              "vscode.executeDefinitionProvider provided incorrect character for super member function definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of super member function with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(64, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of super member function definition with member access operator on this: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for super member function definition with member access operator on this"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              30,
+              "vscode.executeDefinitionProvider provided incorrect line for super member function definition with member access operator on this"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              21,
+              "vscode.executeDefinitionProvider provided incorrect character for super member function definition with member access operator on this"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of super member function with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(65, 11);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of super member function definition with member access operator on super: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for super member function definition with member access operator on super"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              30,
+              "vscode.executeDefinitionProvider provided incorrect line for super member function definition with member access operator on super"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              21,
+              "vscode.executeDefinitionProvider provided incorrect character for super member function definition with member access operator on super"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of super member variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(70, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of super member variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for super member variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              19,
+              "vscode.executeDefinitionProvider provided incorrect line for super member variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              13,
+              "vscode.executeDefinitionProvider provided incorrect character for super member variable definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of super member variable with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(71, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of super member variable definition with member access operator on this: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for super member variable definition with member access operator on this"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              19,
+              "vscode.executeDefinitionProvider provided incorrect line for super member variable definition with member access operator on this"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              13,
+              "vscode.executeDefinitionProvider provided incorrect character for super member variable definition with member access operator on this"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of super member variable with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(72, 11);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of super member variable definition with member access operator on super: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for super member variable definition with member access operator on super"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              19,
+              "vscode.executeDefinitionProvider provided incorrect line for super member variable definition with member access operator on super"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              13,
+              "vscode.executeDefinitionProvider provided incorrect character for super member variable definition with member access operator on super"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of super member property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(77, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of super member property definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for super member property definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              21,
+              "vscode.executeDefinitionProvider provided incorrect line for super member property definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              22,
+              "vscode.executeDefinitionProvider provided incorrect character for super member property definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of super member property with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(78, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of super member property definition with member access operator on this: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for super member property definition with member access operator on this"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              21,
+              "vscode.executeDefinitionProvider provided incorrect line for super member property definition with member access operator on this"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              22,
+              "vscode.executeDefinitionProvider provided incorrect character for super member property definition with member access operator on this"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of super member property with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(79, 11);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of super member property definition with member access operator on super: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for super member property definition with member access operator on super"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              21,
+              "vscode.executeDefinitionProvider provided incorrect line for super member property definition with member access operator on super"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              22,
+              "vscode.executeDefinitionProvider provided incorrect character for super member property definition with member access operator on super"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of constructor", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(107, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of super member property definition with member access operator on super: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              definitionURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for super member property definition with member access operator on super"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              34,
+              "vscode.executeDefinitionProvider provided incorrect line for super member property definition with member access operator on super"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              18,
+              "vscode.executeDefinitionProvider provided incorrect character for super member property definition with member access operator on super"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of file-internal variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(94, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of file-internal variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for file-internal variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              113,
+              "vscode.executeDefinitionProvider provided incorrect line for file-internal variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              4,
+              "vscode.executeDefinitionProvider provided incorrect character for file-internal variable definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of file-internal function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(95, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of file-internal function definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for file-internal function definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              112,
+              "vscode.executeDefinitionProvider provided incorrect line for file-internal function definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              9,
+              "vscode.executeDefinitionProvider provided incorrect character for file-internal function definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of file-internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(97, 37);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of file-internal class definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for file-internal class definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              115,
+              "vscode.executeDefinitionProvider provided incorrect line for file-internal class definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              6,
+              "vscode.executeDefinitionProvider provided incorrect character for file-internal class definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of file-internal constructor", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(97, 64);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of file-internal class definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for file-internal class definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              147,
+              "vscode.executeDefinitionProvider provided incorrect line for file-internal class definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              17,
+              "vscode.executeDefinitionProvider provided incorrect character for file-internal class definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of file-internal member function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(99, 33);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of file-internal member function definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for file-internal member function definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              143,
+              "vscode.executeDefinitionProvider provided incorrect line for file-internal member function definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              17,
+              "vscode.executeDefinitionProvider provided incorrect character for file-internal member function definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of file-internal member variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(100, 33);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of file-internal member variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for file-internal member variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              132,
+              "vscode.executeDefinitionProvider provided incorrect line for file-internal member variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              12,
+              "vscode.executeDefinitionProvider provided incorrect character for file-internal member variable definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of file-internal member property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(101, 33);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of file-internal member property definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for file-internal member property definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              134,
+              "vscode.executeDefinitionProvider provided incorrect line for file-internal member property definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              21,
+              "vscode.executeDefinitionProvider provided incorrect character for file-internal member property definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of file-internal static property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(105, 25);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of file-internal static property definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for file-internal static property definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              119,
+              "vscode.executeDefinitionProvider provided incorrect line for file-internal static property definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              28,
+              "vscode.executeDefinitionProvider provided incorrect character for file-internal static property definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of file-internal static variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(104, 25);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of file-internal static variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for file-internal static variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              117,
+              "vscode.executeDefinitionProvider provided incorrect line for file-internal static variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              19,
+              "vscode.executeDefinitionProvider provided incorrect character for file-internal static variable definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of file-internal static function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(103, 25);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of file-internal static function definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for file-internal static function definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              128,
+              "vscode.executeDefinitionProvider provided incorrect line for file-internal static function definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              24,
+              "vscode.executeDefinitionProvider provided incorrect character for file-internal static function definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
 });
 
-suite("type definition provider: Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeTypeDefinitionProvider finds type definition of local variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "TypeDefinitions.as"));
-		let expected = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "typeDefinition", "LocalVarTypeDefinition.as"));
-		let position = new vscode.Position(14, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeTypeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeTypeDefinitionProvider failed to provide location of local variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), expected.toString(), "vscode.executeTypeDefinitionProvider provided incorrect uri for local variable definition");
-						assert.strictEqual(location.range.start.line, 2, "vscode.executeTypeDefinitionProvider provided incorrect line for local variable definition");
-						assert.strictEqual(location.range.start.character, 14, "vscode.executeTypeDefinitionProvider provided incorrect character for local variable definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute type definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeTypeDefinitionProvider finds type definition of member variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "TypeDefinitions.as"));
-		let expected = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "typeDefinition", "MemberVarTypeDefinition.as"));
-		let position = new vscode.Position(10, 14);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeTypeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeTypeDefinitionProvider failed to provide location of member variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), expected.toString(), "vscode.executeTypeDefinitionProvider provided incorrect uri for member variable definition");
-						assert.strictEqual(location.range.start.line, 2, "vscode.executeTypeDefinitionProvider provided incorrect line for member variable definition");
-						assert.strictEqual(location.range.start.character, 14, "vscode.executeTypeDefinitionProvider provided incorrect character for member variable definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute type definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeTypeDefinitionProvider finds type definition of static variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "TypeDefinitions.as"));
-		let expected = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "typeDefinition", "StaticVarTypeDefinition.as"));
-		let position = new vscode.Position(9, 22);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeTypeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeTypeDefinitionProvider failed to provide location of static variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), expected.toString(), "vscode.executeTypeDefinitionProvider provided incorrect uri for static variable definition");
-						assert.strictEqual(location.range.start.line, 2, "vscode.executeTypeDefinitionProvider provided incorrect line for static variable definition");
-						assert.strictEqual(location.range.start.character, 14, "vscode.executeTypeDefinitionProvider provided incorrect character for static variable definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute type definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeTypeDefinitionProvider finds type definition of parameter", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "TypeDefinitions.as"));
-		let expected = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "typeDefinition", "ParameterTypeDefinition.as"));
-		let position = new vscode.Position(12, 34);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeTypeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeTypeDefinitionProvider failed to provide location of parameter: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), expected.toString(), "vscode.executeTypeDefinitionProvider provided incorrect uri for parameter definition");
-						assert.strictEqual(location.range.start.line, 2, "vscode.executeTypeDefinitionProvider provided incorrect line for parameter definition");
-						assert.strictEqual(location.range.start.character, 14, "vscode.executeTypeDefinitionProvider provided incorrect character for parameter definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute type definition provider: " + uri);
-					});
-		});
-	});
+suite("type definition provider: Application workspace", () => {
+  suiteTeardown(revertAndCloseAllEditors);
+  test("vscode.executeTypeDefinitionProvider finds type definition of local variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "TypeDefinitions.as"
+      )
+    );
+    let expected = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "typeDefinition",
+        "LocalVarTypeDefinition.as"
+      )
+    );
+    let position = new vscode.Position(14, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeTypeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeTypeDefinitionProvider failed to provide location of local variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              expected.toString(),
+              "vscode.executeTypeDefinitionProvider provided incorrect uri for local variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              2,
+              "vscode.executeTypeDefinitionProvider provided incorrect line for local variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              14,
+              "vscode.executeTypeDefinitionProvider provided incorrect character for local variable definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute type definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeTypeDefinitionProvider finds type definition of member variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "TypeDefinitions.as"
+      )
+    );
+    let expected = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "typeDefinition",
+        "MemberVarTypeDefinition.as"
+      )
+    );
+    let position = new vscode.Position(10, 14);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeTypeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeTypeDefinitionProvider failed to provide location of member variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              expected.toString(),
+              "vscode.executeTypeDefinitionProvider provided incorrect uri for member variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              2,
+              "vscode.executeTypeDefinitionProvider provided incorrect line for member variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              14,
+              "vscode.executeTypeDefinitionProvider provided incorrect character for member variable definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute type definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeTypeDefinitionProvider finds type definition of static variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "TypeDefinitions.as"
+      )
+    );
+    let expected = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "typeDefinition",
+        "StaticVarTypeDefinition.as"
+      )
+    );
+    let position = new vscode.Position(9, 22);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeTypeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeTypeDefinitionProvider failed to provide location of static variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              expected.toString(),
+              "vscode.executeTypeDefinitionProvider provided incorrect uri for static variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              2,
+              "vscode.executeTypeDefinitionProvider provided incorrect line for static variable definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              14,
+              "vscode.executeTypeDefinitionProvider provided incorrect character for static variable definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute type definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeTypeDefinitionProvider finds type definition of parameter", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "TypeDefinitions.as"
+      )
+    );
+    let expected = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "typeDefinition",
+        "ParameterTypeDefinition.as"
+      )
+    );
+    let position = new vscode.Position(12, 34);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeTypeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeTypeDefinitionProvider failed to provide location of parameter: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              expected.toString(),
+              "vscode.executeTypeDefinitionProvider provided incorrect uri for parameter definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              2,
+              "vscode.executeTypeDefinitionProvider provided incorrect line for parameter definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              14,
+              "vscode.executeTypeDefinitionProvider provided incorrect character for parameter definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute type definition provider: " + uri);
+          }
+        );
+    });
+  });
 });
 
-suite("hover provider: Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeHoverProvider displays hover for local variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(90, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for local variable reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for local variable reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("localVar:String") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for local variable reference");
-						assert.strictEqual(hover.range.start.line, 90, "vscode.executeHoverProvider provided incorrect line for local variable reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for local variable reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of local function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(92, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for local function reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for local function reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("localFunction():void") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for local function reference");
-						assert.strictEqual(hover.range.start.line, 92, "vscode.executeDefinitionProvider provided incorrect line for local function reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeDefinitionProvider provided incorrect character for local function reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of member variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(54, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for member variable reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for member variable reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("memberVar:Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for member variable reference");
-						assert.strictEqual(hover.range.start.line, 54, "vscode.executeHoverProvider provided incorrect line for member variable reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for member variable reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
+suite("hover provider: Application workspace", () => {
+  suiteTeardown(revertAndCloseAllEditors);
+  test("vscode.executeHoverProvider displays hover for local variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(90, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for local variable reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for local variable reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("localVar:String") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for local variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              90,
+              "vscode.executeHoverProvider provided incorrect line for local variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for local variable reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of local function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(92, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for local function reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for local function reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("localFunction():void") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for local function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              92,
+              "vscode.executeDefinitionProvider provided incorrect line for local function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeDefinitionProvider provided incorrect character for local function reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of member variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(54, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for member variable reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for member variable reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("memberVar:Boolean") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for member variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              54,
+              "vscode.executeHoverProvider provided incorrect line for member variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for member variable reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
 
-	test("vscode.executeHoverProvider displays hover of member variable with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(55, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for member variable reference with member access operator on this: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for member variable reference with member access operator on this: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("memberVar:Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for member variable reference with member access operator on this");
-						assert.strictEqual(hover.range.start.line, 55, "vscode.executeHoverProvider provided incorrect line for member variable reference with member access operator on this");
-						assert.strictEqual(hover.range.start.character, 8, "vscode.executeHoverProvider provided incorrect character for member variable reference with member access operator on this");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of member function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(45, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for member function reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for member function reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("memberFunction():void") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for member function reference");
-						assert.strictEqual(hover.range.start.line, 45, "vscode.executeHoverProvider provided incorrect line for member function reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for member function reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of member function with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(46, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for member function reference with member access operator on this: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for member function reference with member access operator on this: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("memberFunction():void") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for member function reference with member access operator on this");
-						assert.strictEqual(hover.range.start.line, 46, "vscode.executeHoverProvider provided incorrect line for member function reference with member access operator on this");
-						assert.strictEqual(hover.range.start.character, 8, "vscode.executeHoverProvider provided incorrect character for member function reference with member access operator on this");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of member property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(57, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for member property reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for member property reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("memberProperty:Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for member property reference");
-						assert.strictEqual(hover.range.start.line, 57, "vscode.executeHoverProvider provided incorrect line for member property reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for member property reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of member property with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(58, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for member property reference with member access operator on this: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for member property reference with member access operator on this: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("memberProperty:Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for member property reference with member access operator on this");
-						assert.strictEqual(hover.range.start.line, 58, "vscode.executeHoverProvider provided incorrect line for member property reference with member access operator on this");
-						assert.strictEqual(hover.range.start.character, 8, "vscode.executeHoverProvider provided incorrect character for member property reference with member access operator on this");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of static variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(51, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for static variable reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for static variable reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("staticVar:Number") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for static variable reference");
-						assert.strictEqual(hover.range.start.line, 51, "vscode.executeHoverProvider provided incorrect line for static variable reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for static variable reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of static variable with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(52, 17);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for static variable reference with member access operator on class: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for static variable reference with member access operator on class: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("staticVar:Number") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for static variable reference with member access operator on class");
-						assert.strictEqual(hover.range.start.line, 52, "vscode.executeHoverProvider provided incorrect line for static variable reference with member access operator on class");
-						assert.strictEqual(hover.range.start.character, 15, "vscode.executeHoverProvider provided incorrect character for static variable reference with member access operator on class");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of static function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(48, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for static function reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for static function reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("staticFunction():void") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for static function reference");
-						assert.strictEqual(hover.range.start.line, 48, "vscode.executeHoverProvider provided incorrect line for static function reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for static function reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of static function with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(49, 17);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for static function reference with member access operator on class: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for static function reference with member access operator on class: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("staticFunction():void") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for static function reference with member access operator on class");
-						assert.strictEqual(hover.range.start.line, 49, "vscode.executeHoverProvider provided incorrect line for static function reference with member access operator on class");
-						assert.strictEqual(hover.range.start.character, 15, "vscode.executeHoverProvider provided incorrect character for static function reference with member access operator on class");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of static property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(60, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for static property reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for static property reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("staticProperty:Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for static property reference");
-						assert.strictEqual(hover.range.start.line, 60, "vscode.executeHoverProvider provided incorrect line for static property reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for static property reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of static property with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(61, 17);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for static property reference with member access operator on class: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for static property reference with member access operator on class: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("staticProperty:Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for static property reference with member access operator on class");
-						assert.strictEqual(hover.range.start.line, 61, "vscode.executeHoverProvider provided incorrect line for static property reference with member access operator on class");
-						assert.strictEqual(hover.range.start.character, 15, "vscode.executeHoverProvider provided incorrect character for static property reference with member access operator on class");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of package function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "packageFunction.as"));
-		let position = new vscode.Position(84, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for package function reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for package function reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("packageFunction(one:String, two:Number = 3, ...rest:Array):Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for package function reference");
-						assert.strictEqual(hover.range.start.line, 84, "vscode.executeHoverProvider provided incorrect line for package function reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for package function reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of fully-qualified package function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "packageFunction.as"));
-		let position = new vscode.Position(85, 17);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for fully-qualified package function reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for fully-qualified package function reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("packageFunction(one:String, two:Number = 3, ...rest:Array):Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for fully-qualified package function reference");
-						assert.strictEqual(hover.range.start.line, 85, "vscode.executeHoverProvider provided incorrect line for fully-qualified package function reference");
-						assert.strictEqual(hover.range.start.character, 15, "vscode.executeHoverProvider provided incorrect character for fully-qualified package function reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of package variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "packageVar.as"));
-		let position = new vscode.Position(87, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for package variable reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for package variable reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("packageVar:Number") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for package variable reference");
-						assert.strictEqual(hover.range.start.line, 87, "vscode.executeHoverProvider provided incorrect line for package variable reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for package variable reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of fully-qualified package variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "packageVar.as"));
-		let position = new vscode.Position(88, 17);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for fully-qualified package variable reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for fully-qualified package variable reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("packageVar:Number") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for fully-qualified package variable reference");
-						assert.strictEqual(hover.range.start.line, 88, "vscode.executeHoverProvider provided incorrect line for fully-qualified package variable reference");
-						assert.strictEqual(hover.range.start.character, 15, "vscode.executeHoverProvider provided incorrect character for fully-qualified package variable reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of super static variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(74, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for super static variable reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for super static variable reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("superStaticVar:Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for super static variable reference");
-						assert.strictEqual(hover.range.start.line, 74, "vscode.executeHoverProvider provided incorrect line for super static variable reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for super static variable reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of super static variable with member access operator on superclass", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(75, 22);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for super static variable reference with member access operator on superclass: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for super static variable reference with member access operator on superclass: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("superStaticVar:Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for super static variable reference with member access operator on superclass");
-						assert.strictEqual(hover.range.start.line, 75, "vscode.executeHoverProvider provided incorrect line for super static variable reference with member access operator on superclass");
-						assert.strictEqual(hover.range.start.character, 20, "vscode.executeHoverProvider provided incorrect character for super static variable reference with member access operator on superclass");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of super static property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(81, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for super static property reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for super static property reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("superStaticProperty:Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for super static property reference");
-						assert.strictEqual(hover.range.start.line, 81, "vscode.executeHoverProvider provided incorrect line for super static property reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for super static property reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of super static property with member access operator on superclass", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(82, 22);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for super static property reference with member access operator on superclass: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for super static property reference with member access operator on superclass: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("superStaticProperty:Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for super static property reference with member access operator on superclass");
-						assert.strictEqual(hover.range.start.line, 82, "vscode.executeHoverProvider provided incorrect line for super static property reference with member access operator on superclass");
-						assert.strictEqual(hover.range.start.character, 20, "vscode.executeHoverProvider provided incorrect character for super static property reference with member access operator on superclass");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of super static function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(67, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for super static function reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for super static function reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("superStaticFunction():void") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for super static function reference");
-						assert.strictEqual(hover.range.start.line, 67, "vscode.executeHoverProvider provided incorrect line for super static function reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for super static function reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of super static function with member access operator on superclass", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(68, 22);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for super static function reference with member access operator on superclass: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for super static function reference with member access operator on superclass: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("superStaticFunction():void") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for super static function reference with member access operator on superclass");
-						assert.strictEqual(hover.range.start.line, 68, "vscode.executeHoverProvider provided incorrect line for super static function reference with member access operator on superclass");
-						assert.strictEqual(hover.range.start.character, 20, "vscode.executeHoverProvider provided incorrect character for super static function reference with member access operator on superclass");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of super member function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(63, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for super member function reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for super member function reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("superMemberFunction():void") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for super member function reference");
-						assert.strictEqual(hover.range.start.line, 63, "vscode.executeHoverProvider provided incorrect line for super member function reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for super member function reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of super member function with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(64, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for super member function reference with member access operator on this: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for super member function reference with member access operator on this: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("superMemberFunction():void") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for super member function reference with member access operator on this");
-						assert.strictEqual(hover.range.start.line, 64, "vscode.executeHoverProvider provided incorrect line for super member function reference with member access operator on this");
-						assert.strictEqual(hover.range.start.character, 8, "vscode.executeHoverProvider provided incorrect character for super member function reference with member access operator on this");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of super member function with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(65, 11);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for super member function reference with member access operator on super: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for super member function reference with member access operator on super: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("superMemberFunction():void") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for super member function reference with member access operator on super");
-						assert.strictEqual(hover.range.start.line, 65, "vscode.executeHoverProvider provided incorrect line for super member function reference with member access operator on super");
-						assert.strictEqual(hover.range.start.character, 9, "vscode.executeHoverProvider provided incorrect character for super member function reference with member access operator on super");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of super member variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(70, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for super member variable reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for super member variable reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("superMemberVar:String") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for super member variable reference");
-						assert.strictEqual(hover.range.start.line, 70, "vscode.executeHoverProvider provided incorrect line for super member variable reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for super member variable reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of super member variable with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(71, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for super member variable reference with member access operator on this: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for super member variable reference with member access operator on this: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("superMemberVar:String") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for super member variable reference with member access operator on this");
-						assert.strictEqual(hover.range.start.line, 71, "vscode.executeHoverProvider provided incorrect line for super member variable reference with member access operator on this");
-						assert.strictEqual(hover.range.start.character, 8, "vscode.executeHoverProvider provided incorrect character for super member variable reference with member access operator on this");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of super member variable with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(72, 11);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for super member variable reference with member access operator on super: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for super member variable reference with member access operator on super: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("superMemberVar:String") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for super member variable reference with member access operator on super");
-						assert.strictEqual(hover.range.start.line, 72, "vscode.executeHoverProvider provided incorrect line for super member variable reference with member access operator on super");
-						assert.strictEqual(hover.range.start.character, 9, "vscode.executeHoverProvider provided incorrect character for super member variable reference with member access operator on super");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of super member property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(77, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for super member property reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for super member property reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("superMemberProperty:Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for super member property reference");
-						assert.strictEqual(hover.range.start.line, 77, "vscode.executeHoverProvider provided incorrect line for super member property reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for super member property reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of super member property with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(78, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for super member property reference with member access operator on this: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for super member property reference with member access operator on this: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("superMemberProperty:Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for super member property reference with member access operator on this");
-						assert.strictEqual(hover.range.start.line, 78, "vscode.executeHoverProvider provided incorrect line for super member property reference with member access operator on this");
-						assert.strictEqual(hover.range.start.character, 8, "vscode.executeHoverProvider provided incorrect character for super member property reference with member access operator on this");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of super member property with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let definitionURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "SuperDefinitions.as"));
-		let position = new vscode.Position(79, 11);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for super member property reference with member access operator on super: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for super member property reference with member access operator on super: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("superMemberProperty:Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for super member property reference with member access operator on super");
-						assert.strictEqual(hover.range.start.line, 79, "vscode.executeHoverProvider provided incorrect line for super member property reference with member access operator on super");
-						assert.strictEqual(hover.range.start.character, 9, "vscode.executeHoverProvider provided incorrect character for super member property reference with member access operator on super");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of file-internal variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(94, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for file-internal variable reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for file-internal variable reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("internalVar:Number") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for file-internal variable reference");
-						assert.strictEqual(hover.range.start.line, 94, "vscode.executeHoverProvider provided incorrect line for file-internal variable reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for file-internal variable reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of file-internal function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(95, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for file-internal function reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for file-internal function reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("internalFunction():void") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for file-internal function reference");
-						assert.strictEqual(hover.range.start.line, 95, "vscode.executeHoverProvider provided incorrect line for file-internal function reference");
-						assert.strictEqual(hover.range.start.character, 3, "vscode.executeHoverProvider provided incorrect character for file-internal function reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(97, 37);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for file-internal class reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for file-internal class reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("class InternalDefinitions") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for file-internal class reference");
-						assert.strictEqual(hover.range.start.line, 97, "vscode.executeHoverProvider provided incorrect line for file-internal class reference");
-						assert.strictEqual(hover.range.start.character, 35, "vscode.executeHoverProvider provided incorrect character for file-internal class reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of file-internal member function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(99, 33);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for file-internal member function reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for file-internal member function reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("internalMemberFunction():void") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for file-internal member function reference");
-						assert.strictEqual(hover.range.start.line, 99, "vscode.executeHoverProvider provided incorrect line for file-internal member function reference");
-						assert.strictEqual(hover.range.start.character, 31, "vscode.executeHoverProvider provided incorrect character for file-internal member function reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of file-internal member variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(100, 33);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for file-internal member variable reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for file-internal member variable reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("internalMemberVar:String") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for file-internal member variable reference");
-						assert.strictEqual(hover.range.start.line, 100, "vscode.executeHoverProvider provided incorrect line for file-internal member variable reference");
-						assert.strictEqual(hover.range.start.character, 31, "vscode.executeHoverProvider provided incorrect character for file-internal member variable reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of file-internal member property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(101, 33);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for file-internal member property reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for file-internal member property reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("internalMemberProperty:Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for file-internal member property reference");
-						assert.strictEqual(hover.range.start.line, 101, "vscode.executeHoverProvider provided incorrect line for file-internal member property reference");
-						assert.strictEqual(hover.range.start.character, 31, "vscode.executeHoverProvider provided incorrect character for file-internal member property reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of file-internal static property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(105, 25);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for file-internal static property reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for file-internal static property reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("internalStaticProperty:Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for file-internal static property reference");
-						assert.strictEqual(hover.range.start.line, 105, "vscode.executeHoverProvider provided incorrect line for file-internal static property reference");
-						assert.strictEqual(hover.range.start.character, 23, "vscode.executeHoverProvider provided incorrect character for file-internal static property reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of file-internal static variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(104, 25);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for file-internal static variable reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for file-internal static variable reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("internalStaticVar:Boolean") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for file-internal static variable reference");
-						assert.strictEqual(hover.range.start.line, 104, "vscode.executeHoverProvider provided incorrect line for file-internal static variable reference");
-						assert.strictEqual(hover.range.start.character, 23, "vscode.executeHoverProvider provided incorrect character for file-internal static variable reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of file-internal static function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Definitions.as"));
-		let position = new vscode.Position(103, 25);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for file-internal static function reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for file-internal static function reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("internalStaticFunction():void") >= 0, true, "vscode.executeHoverProvider provided incorrect hover for file-internal static function reference");
-						assert.strictEqual(hover.range.start.line, 103, "vscode.executeHoverProvider provided incorrect line for file-internal static function reference");
-						assert.strictEqual(hover.range.start.character, 23, "vscode.executeHoverProvider provided incorrect character for file-internal static function reference");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of Number static constant", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "hover", "HoverConstants.as"));
-		let position = new vscode.Position(4, 24);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for file-internal static function reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for file-internal static function reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("(const) com.example.hover.HoverConstants.NUMBER:Number = 2") >= 0, true, "vscode.executeHoverProvider provided incorrect hover");
-						assert.strictEqual(hover.range.start.line, 4, "vscode.executeHoverProvider provided incorrect line");
-						assert.strictEqual(hover.range.start.character, 22, "vscode.executeHoverProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of Boolean static constant", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "hover", "HoverConstants.as"));
-		let position = new vscode.Position(5, 25);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for file-internal static function reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for file-internal static function reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("(const) com.example.hover.HoverConstants.BOOLEAN:Boolean = false") >= 0, true, "vscode.executeHoverProvider provided incorrect hover");
-						assert.strictEqual(hover.range.start.line, 5, "vscode.executeHoverProvider provided incorrect line");
-						assert.strictEqual(hover.range.start.character, 23, "vscode.executeHoverProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of String static constant", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "hover", "HoverConstants.as"));
-		let position = new vscode.Position(6, 27);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for file-internal static function reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for file-internal static function reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("(const) com.example.hover.HoverConstants.STRING:String = \"hello\"") >= 0, true, "vscode.executeHoverProvider provided incorrect hover");
-						assert.strictEqual(hover.range.start.line, 6, "vscode.executeHoverProvider provided incorrect line");
-						assert.strictEqual(hover.range.start.character, 25, "vscode.executeHoverProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeHoverProvider displays hover of Object static constant", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "hover", "HoverConstants.as"));
-		let position = new vscode.Position(7, 24);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeHoverProvider", uri, position)
-				.then((hovers: vscode.Hover[]) =>
-					{
-						assert.strictEqual(hovers.length, 1,
-							"vscode.executeHoverProvider failed to provide hover for file-internal static function reference: " + uri);
-						let hover = hovers[0];
-						let contents = hover.contents;
-						assert.strictEqual(contents.length, 1,
-							"vscode.executeHoverProvider failed to provide hover contents for file-internal static function reference: " + uri);
-						let content = contents[0];
-						let contentValue: string;
-						if(typeof content === "string")
-						{
-							contentValue = content;
-						}
-						else
-						{
-							contentValue = content.value;
-						}
-						assert.strictEqual(contentValue.indexOf("(const) com.example.hover.HoverConstants.OBJECT:Object") >= 0, true, "vscode.executeHoverProvider provided incorrect hover");
-						assert.strictEqual(hover.range.start.line, 7, "vscode.executeHoverProvider provided incorrect line");
-						assert.strictEqual(hover.range.start.character, 22, "vscode.executeHoverProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute hover provider: " + uri);
-					});
-		});
-	});
+  test("vscode.executeHoverProvider displays hover of member variable with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(55, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for member variable reference with member access operator on this: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for member variable reference with member access operator on this: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("memberVar:Boolean") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for member variable reference with member access operator on this"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              55,
+              "vscode.executeHoverProvider provided incorrect line for member variable reference with member access operator on this"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              8,
+              "vscode.executeHoverProvider provided incorrect character for member variable reference with member access operator on this"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of member function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(45, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for member function reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for member function reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("memberFunction():void") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for member function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              45,
+              "vscode.executeHoverProvider provided incorrect line for member function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for member function reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of member function with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(46, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for member function reference with member access operator on this: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for member function reference with member access operator on this: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("memberFunction():void") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for member function reference with member access operator on this"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              46,
+              "vscode.executeHoverProvider provided incorrect line for member function reference with member access operator on this"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              8,
+              "vscode.executeHoverProvider provided incorrect character for member function reference with member access operator on this"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of member property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(57, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for member property reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for member property reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("memberProperty:Boolean") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for member property reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              57,
+              "vscode.executeHoverProvider provided incorrect line for member property reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for member property reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of member property with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(58, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for member property reference with member access operator on this: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for member property reference with member access operator on this: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("memberProperty:Boolean") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for member property reference with member access operator on this"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              58,
+              "vscode.executeHoverProvider provided incorrect line for member property reference with member access operator on this"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              8,
+              "vscode.executeHoverProvider provided incorrect character for member property reference with member access operator on this"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of static variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(51, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for static variable reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for static variable reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("staticVar:Number") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for static variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              51,
+              "vscode.executeHoverProvider provided incorrect line for static variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for static variable reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of static variable with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(52, 17);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for static variable reference with member access operator on class: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for static variable reference with member access operator on class: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("staticVar:Number") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for static variable reference with member access operator on class"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              52,
+              "vscode.executeHoverProvider provided incorrect line for static variable reference with member access operator on class"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              15,
+              "vscode.executeHoverProvider provided incorrect character for static variable reference with member access operator on class"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of static function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(48, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for static function reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for static function reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("staticFunction():void") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for static function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              48,
+              "vscode.executeHoverProvider provided incorrect line for static function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for static function reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of static function with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(49, 17);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for static function reference with member access operator on class: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for static function reference with member access operator on class: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("staticFunction():void") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for static function reference with member access operator on class"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              49,
+              "vscode.executeHoverProvider provided incorrect line for static function reference with member access operator on class"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              15,
+              "vscode.executeHoverProvider provided incorrect character for static function reference with member access operator on class"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of static property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(60, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for static property reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for static property reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("staticProperty:Boolean") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for static property reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              60,
+              "vscode.executeHoverProvider provided incorrect line for static property reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for static property reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of static property with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(61, 17);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for static property reference with member access operator on class: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for static property reference with member access operator on class: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("staticProperty:Boolean") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for static property reference with member access operator on class"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              61,
+              "vscode.executeHoverProvider provided incorrect line for static property reference with member access operator on class"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              15,
+              "vscode.executeHoverProvider provided incorrect character for static property reference with member access operator on class"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of package function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "packageFunction.as"
+      )
+    );
+    let position = new vscode.Position(84, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for package function reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for package function reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf(
+                "packageFunction(one:String, two:Number = 3, ...rest:Array):Boolean"
+              ) >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for package function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              84,
+              "vscode.executeHoverProvider provided incorrect line for package function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for package function reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of fully-qualified package function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "packageFunction.as"
+      )
+    );
+    let position = new vscode.Position(85, 17);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for fully-qualified package function reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for fully-qualified package function reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf(
+                "packageFunction(one:String, two:Number = 3, ...rest:Array):Boolean"
+              ) >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for fully-qualified package function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              85,
+              "vscode.executeHoverProvider provided incorrect line for fully-qualified package function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              15,
+              "vscode.executeHoverProvider provided incorrect character for fully-qualified package function reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of package variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "packageVar.as"
+      )
+    );
+    let position = new vscode.Position(87, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for package variable reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for package variable reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("packageVar:Number") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for package variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              87,
+              "vscode.executeHoverProvider provided incorrect line for package variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for package variable reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of fully-qualified package variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "packageVar.as"
+      )
+    );
+    let position = new vscode.Position(88, 17);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for fully-qualified package variable reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for fully-qualified package variable reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("packageVar:Number") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for fully-qualified package variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              88,
+              "vscode.executeHoverProvider provided incorrect line for fully-qualified package variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              15,
+              "vscode.executeHoverProvider provided incorrect character for fully-qualified package variable reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of super static variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(74, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for super static variable reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for super static variable reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("superStaticVar:Boolean") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for super static variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              74,
+              "vscode.executeHoverProvider provided incorrect line for super static variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for super static variable reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of super static variable with member access operator on superclass", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(75, 22);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for super static variable reference with member access operator on superclass: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for super static variable reference with member access operator on superclass: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("superStaticVar:Boolean") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for super static variable reference with member access operator on superclass"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              75,
+              "vscode.executeHoverProvider provided incorrect line for super static variable reference with member access operator on superclass"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              20,
+              "vscode.executeHoverProvider provided incorrect character for super static variable reference with member access operator on superclass"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of super static property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(81, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for super static property reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for super static property reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("superStaticProperty:Boolean") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for super static property reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              81,
+              "vscode.executeHoverProvider provided incorrect line for super static property reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for super static property reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of super static property with member access operator on superclass", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(82, 22);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for super static property reference with member access operator on superclass: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for super static property reference with member access operator on superclass: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("superStaticProperty:Boolean") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for super static property reference with member access operator on superclass"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              82,
+              "vscode.executeHoverProvider provided incorrect line for super static property reference with member access operator on superclass"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              20,
+              "vscode.executeHoverProvider provided incorrect character for super static property reference with member access operator on superclass"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of super static function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(67, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for super static function reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for super static function reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("superStaticFunction():void") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for super static function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              67,
+              "vscode.executeHoverProvider provided incorrect line for super static function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for super static function reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of super static function with member access operator on superclass", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(68, 22);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for super static function reference with member access operator on superclass: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for super static function reference with member access operator on superclass: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("superStaticFunction():void") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for super static function reference with member access operator on superclass"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              68,
+              "vscode.executeHoverProvider provided incorrect line for super static function reference with member access operator on superclass"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              20,
+              "vscode.executeHoverProvider provided incorrect character for super static function reference with member access operator on superclass"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of super member function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(63, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for super member function reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for super member function reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("superMemberFunction():void") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for super member function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              63,
+              "vscode.executeHoverProvider provided incorrect line for super member function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for super member function reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of super member function with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(64, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for super member function reference with member access operator on this: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for super member function reference with member access operator on this: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("superMemberFunction():void") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for super member function reference with member access operator on this"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              64,
+              "vscode.executeHoverProvider provided incorrect line for super member function reference with member access operator on this"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              8,
+              "vscode.executeHoverProvider provided incorrect character for super member function reference with member access operator on this"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of super member function with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(65, 11);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for super member function reference with member access operator on super: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for super member function reference with member access operator on super: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("superMemberFunction():void") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for super member function reference with member access operator on super"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              65,
+              "vscode.executeHoverProvider provided incorrect line for super member function reference with member access operator on super"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              9,
+              "vscode.executeHoverProvider provided incorrect character for super member function reference with member access operator on super"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of super member variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(70, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for super member variable reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for super member variable reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("superMemberVar:String") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for super member variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              70,
+              "vscode.executeHoverProvider provided incorrect line for super member variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for super member variable reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of super member variable with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(71, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for super member variable reference with member access operator on this: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for super member variable reference with member access operator on this: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("superMemberVar:String") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for super member variable reference with member access operator on this"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              71,
+              "vscode.executeHoverProvider provided incorrect line for super member variable reference with member access operator on this"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              8,
+              "vscode.executeHoverProvider provided incorrect character for super member variable reference with member access operator on this"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of super member variable with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(72, 11);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for super member variable reference with member access operator on super: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for super member variable reference with member access operator on super: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("superMemberVar:String") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for super member variable reference with member access operator on super"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              72,
+              "vscode.executeHoverProvider provided incorrect line for super member variable reference with member access operator on super"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              9,
+              "vscode.executeHoverProvider provided incorrect character for super member variable reference with member access operator on super"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of super member property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(77, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for super member property reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for super member property reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("superMemberProperty:Boolean") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for super member property reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              77,
+              "vscode.executeHoverProvider provided incorrect line for super member property reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for super member property reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of super member property with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(78, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for super member property reference with member access operator on this: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for super member property reference with member access operator on this: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("superMemberProperty:Boolean") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for super member property reference with member access operator on this"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              78,
+              "vscode.executeHoverProvider provided incorrect line for super member property reference with member access operator on this"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              8,
+              "vscode.executeHoverProvider provided incorrect character for super member property reference with member access operator on this"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of super member property with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let definitionURI = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "SuperDefinitions.as"
+      )
+    );
+    let position = new vscode.Position(79, 11);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for super member property reference with member access operator on super: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for super member property reference with member access operator on super: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("superMemberProperty:Boolean") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for super member property reference with member access operator on super"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              79,
+              "vscode.executeHoverProvider provided incorrect line for super member property reference with member access operator on super"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              9,
+              "vscode.executeHoverProvider provided incorrect character for super member property reference with member access operator on super"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of file-internal variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(94, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for file-internal variable reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for file-internal variable reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("internalVar:Number") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for file-internal variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              94,
+              "vscode.executeHoverProvider provided incorrect line for file-internal variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for file-internal variable reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of file-internal function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(95, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for file-internal function reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for file-internal function reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("internalFunction():void") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for file-internal function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              95,
+              "vscode.executeHoverProvider provided incorrect line for file-internal function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              3,
+              "vscode.executeHoverProvider provided incorrect character for file-internal function reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of file-internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(97, 37);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for file-internal class reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for file-internal class reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("class InternalDefinitions") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for file-internal class reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              97,
+              "vscode.executeHoverProvider provided incorrect line for file-internal class reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              35,
+              "vscode.executeHoverProvider provided incorrect character for file-internal class reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of file-internal member function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(99, 33);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for file-internal member function reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for file-internal member function reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("internalMemberFunction():void") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for file-internal member function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              99,
+              "vscode.executeHoverProvider provided incorrect line for file-internal member function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              31,
+              "vscode.executeHoverProvider provided incorrect character for file-internal member function reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of file-internal member variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(100, 33);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for file-internal member variable reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for file-internal member variable reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("internalMemberVar:String") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for file-internal member variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              100,
+              "vscode.executeHoverProvider provided incorrect line for file-internal member variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              31,
+              "vscode.executeHoverProvider provided incorrect character for file-internal member variable reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of file-internal member property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(101, 33);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for file-internal member property reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for file-internal member property reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("internalMemberProperty:Boolean") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for file-internal member property reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              101,
+              "vscode.executeHoverProvider provided incorrect line for file-internal member property reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              31,
+              "vscode.executeHoverProvider provided incorrect character for file-internal member property reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of file-internal static property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(105, 25);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for file-internal static property reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for file-internal static property reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("internalStaticProperty:Boolean") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for file-internal static property reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              105,
+              "vscode.executeHoverProvider provided incorrect line for file-internal static property reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              23,
+              "vscode.executeHoverProvider provided incorrect character for file-internal static property reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of file-internal static variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(104, 25);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for file-internal static variable reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for file-internal static variable reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("internalStaticVar:Boolean") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for file-internal static variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              104,
+              "vscode.executeHoverProvider provided incorrect line for file-internal static variable reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              23,
+              "vscode.executeHoverProvider provided incorrect character for file-internal static variable reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of file-internal static function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Definitions.as"
+      )
+    );
+    let position = new vscode.Position(103, 25);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for file-internal static function reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for file-internal static function reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf("internalStaticFunction():void") >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover for file-internal static function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              103,
+              "vscode.executeHoverProvider provided incorrect line for file-internal static function reference"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              23,
+              "vscode.executeHoverProvider provided incorrect character for file-internal static function reference"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of Number static constant", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "hover",
+        "HoverConstants.as"
+      )
+    );
+    let position = new vscode.Position(4, 24);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for file-internal static function reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for file-internal static function reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf(
+                "(const) com.example.hover.HoverConstants.NUMBER:Number = 2"
+              ) >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              4,
+              "vscode.executeHoverProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              22,
+              "vscode.executeHoverProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of Boolean static constant", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "hover",
+        "HoverConstants.as"
+      )
+    );
+    let position = new vscode.Position(5, 25);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for file-internal static function reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for file-internal static function reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf(
+                "(const) com.example.hover.HoverConstants.BOOLEAN:Boolean = false"
+              ) >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              5,
+              "vscode.executeHoverProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              23,
+              "vscode.executeHoverProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of String static constant", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "hover",
+        "HoverConstants.as"
+      )
+    );
+    let position = new vscode.Position(6, 27);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for file-internal static function reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for file-internal static function reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf(
+                '(const) com.example.hover.HoverConstants.STRING:String = "hello"'
+              ) >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              6,
+              "vscode.executeHoverProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              25,
+              "vscode.executeHoverProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeHoverProvider displays hover of Object static constant", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "hover",
+        "HoverConstants.as"
+      )
+    );
+    let position = new vscode.Position(7, 24);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeHoverProvider", uri, position)
+        .then(
+          (hovers: vscode.Hover[]) => {
+            assert.strictEqual(
+              hovers.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover for file-internal static function reference: " +
+                uri
+            );
+            let hover = hovers[0];
+            let contents = hover.contents;
+            assert.strictEqual(
+              contents.length,
+              1,
+              "vscode.executeHoverProvider failed to provide hover contents for file-internal static function reference: " +
+                uri
+            );
+            let content = contents[0];
+            let contentValue: string;
+            if (typeof content === "string") {
+              contentValue = content;
+            } else {
+              contentValue = content.value;
+            }
+            assert.strictEqual(
+              contentValue.indexOf(
+                "(const) com.example.hover.HoverConstants.OBJECT:Object"
+              ) >= 0,
+              true,
+              "vscode.executeHoverProvider provided incorrect hover"
+            );
+            assert.strictEqual(
+              hover.range.start.line,
+              7,
+              "vscode.executeHoverProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              hover.range.start.character,
+              22,
+              "vscode.executeHoverProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute hover provider: " + uri);
+          }
+        );
+    });
+  });
 });
 
-suite("completion item provider: Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeCompletionItemProvider includes local variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localVarItem = findCompletionItem("localVar", items);
-						assert.notEqual(localVarItem, null, "vscode.executeCompletionItemProvider failed to provide local variable: " + uri);
-						assert.strictEqual(localVarItem.kind, vscode.CompletionItemKind.Variable, "vscode.executeCompletionItemProvider failed to provide correct kind of local variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits local variable with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(49, 14);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localVarItem = findCompletionItem("localVar", items);
-						assert.equal(localVarItem, null, "vscode.executeCompletionItemProvider failed to omit local variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits local variable with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localVarItem = findCompletionItem("localVar", items);
-						assert.equal(localVarItem, null, "vscode.executeCompletionItemProvider failed to omit local variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits local variable with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localVarItem = findCompletionItem("localVar", items);
-						assert.equal(localVarItem, null, "vscode.executeCompletionItemProvider failed to omit local variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits local variable with member access operator on fully-qualified package", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(51, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localVarItem = findCompletionItem("localVar", items);
-						assert.equal(localVarItem, null, "vscode.executeCompletionItemProvider failed to omit local variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits local variable from type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberVarItem = findCompletionItem("localVar", items);
-						assert.equal(superMemberVarItem, null, "vscode.executeCompletionItemProvider failed to omit local variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes local function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localFunctionItem = findCompletionItem("localFunction", items);
-						assert.notEqual(localFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide local function: " + uri);
-						assert.strictEqual(localFunctionItem.kind, vscode.CompletionItemKind.Function, "vscode.executeCompletionItemProvider failed to provide correct kind of local function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits local function with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(49, 14);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localFunctionItem = findCompletionItem("localFunction", items);
-						assert.equal(localFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit local function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits local function with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localFunctionItem = findCompletionItem("localFunction", items);
-						assert.equal(localFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit local function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits local function with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localVarItem = findCompletionItem("localFunction", items);
-						assert.equal(localVarItem, null, "vscode.executeCompletionItemProvider failed to omit local function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits local function with member access operator on fully-qualified package", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(51, 51);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localFunctionItem = findCompletionItem("localFunction", items);
-						assert.equal(localFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit local function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits local function from type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberVarItem = findCompletionItem("localFunction", items);
-						assert.equal(superMemberVarItem, null, "vscode.executeCompletionItemProvider failed to omit local function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes member variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberVarItem = findCompletionItem("memberVar", items);
-						assert.notEqual(memberVarItem, null, "vscode.executeCompletionItemProvider failed to provide member variable: " + uri);
-						assert.strictEqual(memberVarItem.kind, vscode.CompletionItemKind.Field, "vscode.executeCompletionItemProvider failed to provide correct kind of member variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits member variable with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(49, 14);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberVarItem = findCompletionItem("memberVar", items);
-						assert.equal(memberVarItem, null, "vscode.executeCompletionItemProvider failed to omit member variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes member variable with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberVarItem = findCompletionItem("memberVar", items);
-						assert.notEqual(memberVarItem, null, "vscode.executeCompletionItemProvider failed to provide member variable: " + uri);
-						assert.strictEqual(memberVarItem.kind, vscode.CompletionItemKind.Field, "vscode.executeCompletionItemProvider failed to provide correct kind of member variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits member variable with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberVarItem = findCompletionItem("memberVar", items);
-						assert.equal(memberVarItem, null, "vscode.executeCompletionItemProvider failed to omit member variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits member variable with member access operator on fully-qualified package", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(51, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberVarItem = findCompletionItem("memberVar", items);
-						assert.equal(memberVarItem, null, "vscode.executeCompletionItemProvider failed to omit member variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits member variable from type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberVarItem = findCompletionItem("memberVar", items);
-						assert.equal(superMemberVarItem, null, "vscode.executeCompletionItemProvider failed to omit member variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes member function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberFunctionItem = findCompletionItem("memberFunction", items);
-						assert.notEqual(memberFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide member function: " + uri);
-						assert.strictEqual(memberFunctionItem.kind, vscode.CompletionItemKind.Method, "vscode.executeCompletionItemProvider failed to provide correct kind of member function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits member function with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(49, 14);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberFunctionItem = findCompletionItem("memberFunction", items);
-						assert.equal(memberFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit member variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes member function with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberFunctionItem = findCompletionItem("memberFunction", items);
-						assert.notEqual(memberFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide member function: " + uri);
-						assert.strictEqual(memberFunctionItem.kind, vscode.CompletionItemKind.Method, "vscode.executeCompletionItemProvider failed to provide correct kind of member function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits member function with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberFunctionItem = findCompletionItem("memberFunction", items);
-						assert.equal(memberFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit member variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits member function with member access operator on fully-qualified package", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(51, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberFunctionItem = findCompletionItem("memberFunction", items);
-						assert.equal(memberFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit member variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits member function from type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberFunctionItem = findCompletionItem("memberFunction", items);
-						assert.equal(memberFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit member function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes member property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberPropItem = findCompletionItem("memberProperty", items);
-						assert.notEqual(memberPropItem, null, "vscode.executeCompletionItemProvider failed to provide member property: " + uri);
-						assert.strictEqual(memberPropItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of member property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits member property with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(49, 14);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberPropItem = findCompletionItem("memberProperty", items);
-						assert.equal(memberPropItem, null, "vscode.executeCompletionItemProvider failed to omit member property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes member property with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberPropItem = findCompletionItem("memberProperty", items);
-						assert.notEqual(memberPropItem, null, "vscode.executeCompletionItemProvider failed to provide member property: " + uri);
-						assert.strictEqual(memberPropItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of member property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits member property with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberPropItem = findCompletionItem("memberProperty", items);
-						assert.equal(memberPropItem, null, "vscode.executeCompletionItemProvider failed to omit member property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits member property with member access operator on fully-qualified package", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(51, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberPropItem = findCompletionItem("memberProperty", items);
-						assert.equal(memberPropItem, null, "vscode.executeCompletionItemProvider failed to omit member property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits member property from type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let memberPropItem = findCompletionItem("memberProperty", items);
-						assert.equal(memberPropItem, null, "vscode.executeCompletionItemProvider failed to omit member property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes static variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticVarItem = findCompletionItem("staticVar", items);
-						assert.notEqual(staticVarItem, null, "vscode.executeCompletionItemProvider failed to provide static variable: " + uri);
-						assert.strictEqual(staticVarItem.kind, vscode.CompletionItemKind.Field, "vscode.executeCompletionItemProvider failed to provide correct kind of static variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes static variable with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(49, 14);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticVarItem = findCompletionItem("staticVar", items);
-						assert.notEqual(staticVarItem, null, "vscode.executeCompletionItemProvider failed to provide static variable: " + uri);
-						assert.strictEqual(staticVarItem.kind, vscode.CompletionItemKind.Field, "vscode.executeCompletionItemProvider failed to provide correct kind of static variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits static variable with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticVarItem = findCompletionItem("staticVar", items);
-						assert.equal(staticVarItem, null, "vscode.executeCompletionItemProvider failed to omit static variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits static variable with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticVarItem = findCompletionItem("staticVar", items);
-						assert.equal(staticVarItem, null, "vscode.executeCompletionItemProvider failed to omit static variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits static variable with member access operator on fully-qualified package", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(51, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticVarItem = findCompletionItem("staticVar", items);
-						assert.equal(staticVarItem, null, "vscode.executeCompletionItemProvider failed to omit static variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits static variable from type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticVarItem = findCompletionItem("staticVar", items);
-						assert.equal(staticVarItem, null, "vscode.executeCompletionItemProvider failed to omit static variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes static function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticFunctionItem = findCompletionItem("staticFunction", items);
-						assert.notEqual(staticFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide static function: " + uri);
-						assert.strictEqual(staticFunctionItem.kind, vscode.CompletionItemKind.Method, "vscode.executeCompletionItemProvider failed to provide correct kind of static function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes static function with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(49, 14);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticFunctionItem = findCompletionItem("staticFunction", items);
-						assert.notEqual(staticFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide static function: " + uri);
-						assert.strictEqual(staticFunctionItem.kind, vscode.CompletionItemKind.Method, "vscode.executeCompletionItemProvider failed to provide correct kind of static function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits static function with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticFunctionItem = findCompletionItem("staticFunction", items);
-						assert.equal(staticFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit static function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits static function with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticFunctionItem = findCompletionItem("staticFunction", items);
-						assert.equal(staticFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit static function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits static function with member access operator on fully-qualified package", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(51, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticFunctionItem = findCompletionItem("staticFunction", items);
-						assert.equal(staticFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit static function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits static function from type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticFunctionItem = findCompletionItem("staticFunction", items);
-						assert.equal(staticFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit static function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes static property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticPropItem = findCompletionItem("staticProperty", items);
-						assert.notEqual(staticPropItem, null, "vscode.executeCompletionItemProvider failed to provide static property: " + uri);
-						assert.strictEqual(staticPropItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of static property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes static property with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(49, 14);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticPropItem = findCompletionItem("staticProperty", items);
-						assert.notEqual(staticPropItem, null, "vscode.executeCompletionItemProvider failed to provide static property: " + uri);
-						assert.strictEqual(staticPropItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of static property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits static property with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticPropItem = findCompletionItem("staticProperty", items);
-						assert.equal(staticPropItem, null, "vscode.executeCompletionItemProvider failed to omit static property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits static property with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticPropItem = findCompletionItem("staticProperty", items);
-						assert.equal(staticPropItem, null, "vscode.executeCompletionItemProvider failed to omit static property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits static property with member access operator on fully-qualified package", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(51, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticPropItem = findCompletionItem("staticProperty", items);
-						assert.equal(staticPropItem, null, "vscode.executeCompletionItemProvider failed to omit static property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits static property from type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let staticPropItem = findCompletionItem("staticProperty", items);
-						assert.equal(staticPropItem, null, "vscode.executeCompletionItemProvider failed to omit static property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes package class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let packageClassItem = findCompletionItem("UnreferencedClass", items);
-						assert.notEqual(packageClassItem, null, "vscode.executeCompletionItemProvider failed to provide package class: " + uri);
-						assert.strictEqual(packageClassItem.kind, vscode.CompletionItemKind.Class, "vscode.executeCompletionItemProvider failed to provide correct kind of package class: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes package class with member access on fully-qualified package", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(50, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let classItem = findCompletionItem("UnreferencedClass", items);
-						assert.notEqual(classItem, null, "vscode.executeCompletionItemProvider failed to provide package class: " + uri);
-						assert.strictEqual(classItem.kind, vscode.CompletionItemKind.Class, "vscode.executeCompletionItemProvider failed to provide correct kind of package class: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits package class with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localVarItem = findCompletionItem("UnreferencedClass", items);
-						assert.equal(localVarItem, null, "vscode.executeCompletionItemProvider failed to omit package class: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits package class with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localVarItem = findCompletionItem("UnreferencedClass", items);
-						assert.equal(localVarItem, null, "vscode.executeCompletionItemProvider failed to omit package class: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes package class as type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let packageClassItem = findCompletionItem("UnreferencedClass", items);
-						assert.notEqual(packageClassItem, null, "vscode.executeCompletionItemProvider failed to provide package class: " + uri);
-						assert.strictEqual(packageClassItem.kind, vscode.CompletionItemKind.Class, "vscode.executeCompletionItemProvider failed to provide correct kind of package class: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes package variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let packageVarItem = findCompletionItem("packageVar", items);
-						assert.notEqual(packageVarItem, null, "vscode.executeCompletionItemProvider failed to provide package variable: " + uri);
-						assert.strictEqual(packageVarItem.kind, vscode.CompletionItemKind.Variable, "vscode.executeCompletionItemProvider failed to provide correct kind of package variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes package variable with member access on fully-qualified package", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(50, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let packageVarItem = findCompletionItem("packageVar", items);
-						assert.notEqual(packageVarItem, null, "vscode.executeCompletionItemProvider failed to provide package variable: " + uri);
-						assert.strictEqual(packageVarItem.kind, vscode.CompletionItemKind.Variable, "vscode.executeCompletionItemProvider failed to provide correct kind of package variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits package variable with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localVarItem = findCompletionItem("packageVar", items);
-						assert.equal(localVarItem, null, "vscode.executeCompletionItemProvider failed to omit package variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits package variable with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localVarItem = findCompletionItem("packageVar", items);
-						assert.equal(localVarItem, null, "vscode.executeCompletionItemProvider failed to omit package variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits package variable as type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let packageClassItem = findCompletionItem("packageVar", items);
-						assert.equal(packageClassItem, null, "vscode.executeCompletionItemProvider failed to omits package variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes package function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let packageFunctionItem = findCompletionItem("packageFunction", items);
-						assert.notEqual(packageFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide package function: " + uri);
-						assert.strictEqual(packageFunctionItem.kind, vscode.CompletionItemKind.Function, "vscode.executeCompletionItemProvider failed to provide correct kind of package function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes package function with member access on fully-qualified package", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(50, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let packageFunctionItem = findCompletionItem("packageFunction", items);
-						assert.notEqual(packageFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide package function: " + uri);
-						assert.strictEqual(packageFunctionItem.kind, vscode.CompletionItemKind.Function, "vscode.executeCompletionItemProvider failed to provide correct kind of package function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits package function with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localVarItem = findCompletionItem("packageFunction", items);
-						assert.equal(localVarItem, null, "vscode.executeCompletionItemProvider failed to omit package function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits package function with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localVarItem = findCompletionItem("packageFunction", items);
-						assert.equal(localVarItem, null, "vscode.executeCompletionItemProvider failed to omit package function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits package function as type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let packageClassItem = findCompletionItem("packageFunction", items);
-						assert.equal(packageClassItem, null, "vscode.executeCompletionItemProvider failed to omits package function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super member variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberVarItem = findCompletionItem("superMemberVar", items);
-						assert.notEqual(superMemberVarItem, null, "vscode.executeCompletionItemProvider failed to provide super member variable: " + uri);
-						assert.strictEqual(superMemberVarItem.kind, vscode.CompletionItemKind.Field, "vscode.executeCompletionItemProvider failed to provide correct kind of super member variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super member variable with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberVarItem = findCompletionItem("superMemberVar", items);
-						assert.notEqual(superMemberVarItem, null, "vscode.executeCompletionItemProvider failed to provide super member variable: " + uri);
-						assert.strictEqual(superMemberVarItem.kind, vscode.CompletionItemKind.Field, "vscode.executeCompletionItemProvider failed to provide correct kind of super member variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits super member variable from type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberVarItem = findCompletionItem("superMemberVar", items);
-						assert.equal(superMemberVarItem, null, "vscode.executeCompletionItemProvider failed to omit super member variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super member variable with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberVarItem = findCompletionItem("superMemberVar", items);
-						assert.notEqual(superMemberVarItem, null, "vscode.executeCompletionItemProvider failed to provide member super variable: " + uri);
-						assert.strictEqual(superMemberVarItem.kind, vscode.CompletionItemKind.Field, "vscode.executeCompletionItemProvider failed to provide correct kind of super member variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super member property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberPropertyItem = findCompletionItem("superMemberProperty", items);
-						assert.notEqual(superMemberPropertyItem, null, "vscode.executeCompletionItemProvider failed to provide super member property: " + uri);
-						assert.strictEqual(superMemberPropertyItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of super member property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super member property with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberPropertyItem = findCompletionItem("superMemberProperty", items);
-						assert.notEqual(superMemberPropertyItem, null, "vscode.executeCompletionItemProvider failed to provide super member property: " + uri);
-						assert.strictEqual(superMemberPropertyItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of super member property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super member property with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberPropertyItem = findCompletionItem("superMemberProperty", items);
-						assert.notEqual(superMemberPropertyItem, null, "vscode.executeCompletionItemProvider failed to provide super member property: " + uri);
-						assert.strictEqual(superMemberPropertyItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of super member property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits super member property from type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberVarItem = findCompletionItem("superMemberProperty", items);
-						assert.equal(superMemberVarItem, null, "vscode.executeCompletionItemProvider failed to omit super member property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super member function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberFunctionItem = findCompletionItem("superMemberFunction", items);
-						assert.notEqual(superMemberFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide super member function: " + uri);
-						assert.strictEqual(superMemberFunctionItem.kind, vscode.CompletionItemKind.Method, "vscode.executeCompletionItemProvider failed to provide correct kind of super member function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super member function with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberFunctionItem = findCompletionItem("superMemberFunction", items);
-						assert.notEqual(superMemberFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide super member function: " + uri);
-						assert.strictEqual(superMemberFunctionItem.kind, vscode.CompletionItemKind.Method, "vscode.executeCompletionItemProvider failed to provide correct kind of super member function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super member function with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberFunctionItem = findCompletionItem("superMemberFunction", items);
-						assert.notEqual(superMemberFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide super member function: " + uri);
-						assert.strictEqual(superMemberFunctionItem.kind, vscode.CompletionItemKind.Method, "vscode.executeCompletionItemProvider failed to provide correct kind of super member function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits super member function from type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberVarItem = findCompletionItem("superMemberFunction", items);
-						assert.equal(superMemberVarItem, null, "vscode.executeCompletionItemProvider failed to omit super member function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super static variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superStaticVarItem = findCompletionItem("superStaticVar", items);
-						assert.notEqual(superStaticVarItem, null, "vscode.executeCompletionItemProvider failed to provide super static variable: " + uri);
-						assert.strictEqual(superStaticVarItem.kind, vscode.CompletionItemKind.Field, "vscode.executeCompletionItemProvider failed to provide correct kind of super static variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits super static variable with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(49, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superStaticVarItem = findCompletionItem("superStaticVar", items);
-						assert.equal(superStaticVarItem, null, "vscode.executeCompletionItemProvider failed to omit super static variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super static variable with member access operator on superclass", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(50, 20);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superStaticVarItem = findCompletionItem("superStaticVar", items);
-						assert.notEqual(superStaticVarItem, null, "vscode.executeCompletionItemProvider failed to provide super static variable: " + uri);
-						assert.strictEqual(superStaticVarItem.kind, vscode.CompletionItemKind.Field, "vscode.executeCompletionItemProvider failed to provide correct kind of super static variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super static variable with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberFunctionItem = findCompletionItem("superStaticVar", items);
-						assert.equal(superMemberFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit super static variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits super static variable with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberFunctionItem = findCompletionItem("superStaticVar", items);
-						assert.equal(superMemberFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide super static variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits super static variable from type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberVarItem = findCompletionItem("superStaticVar", items);
-						assert.equal(superMemberVarItem, null, "vscode.executeCompletionItemProvider failed to omit super static variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super static property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superStaticPropertyItem = findCompletionItem("superStaticProperty", items);
-						assert.notEqual(superStaticPropertyItem, null, "vscode.executeCompletionItemProvider failed to provide super static property: " + uri);
-						assert.strictEqual(superStaticPropertyItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of super static property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits super static property with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(49, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superStaticPropertyItem = findCompletionItem("superStaticProperty", items);
-						assert.equal(superStaticPropertyItem, null, "vscode.executeCompletionItemProvider failed to omit super static property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super static property with member access operator on superclass", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(50, 20);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superStaticPropertyItem = findCompletionItem("superStaticProperty", items);
-						assert.notEqual(superStaticPropertyItem, null, "vscode.executeCompletionItemProvider failed to provide super static property: " + uri);
-						assert.strictEqual(superStaticPropertyItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of super static property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super static property with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberFunctionItem = findCompletionItem("superStaticProperty", items);
-						assert.equal(superMemberFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit super static property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits super static property with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberFunctionItem = findCompletionItem("superStaticProperty", items);
-						assert.equal(superMemberFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide super static property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits super static property from type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberVarItem = findCompletionItem("superStaticProperty", items);
-						assert.equal(superMemberVarItem, null, "vscode.executeCompletionItemProvider failed to omit super static property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super static function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superStaticFunctionItem = findCompletionItem("superStaticFunction", items);
-						assert.notEqual(superStaticFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide super static function: " + uri);
-						assert.strictEqual(superStaticFunctionItem.kind, vscode.CompletionItemKind.Method, "vscode.executeCompletionItemProvider failed to provide correct kind of super static function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits super static function with member access operator on class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(49, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superStaticFunctionItem = findCompletionItem("superStaticFunction", items);
-						assert.equal(superStaticFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit super static function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super static function with member access operator on superclass", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(50, 20);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superStaticFunctionItem = findCompletionItem("superStaticFunction", items);
-						assert.notEqual(superStaticFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide super static function: " + uri);
-						assert.strictEqual(superStaticFunctionItem.kind, vscode.CompletionItemKind.Method, "vscode.executeCompletionItemProvider failed to provide correct kind of super static function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes super static function with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberFunctionItem = findCompletionItem("superStaticFunction", items);
-						assert.equal(superMemberFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit super static function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits super static function with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberFunctionItem = findCompletionItem("superStaticFunction", items);
-						assert.equal(superMemberFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide super static function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits super static function from type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberVarItem = findCompletionItem("superStaticFunction", items);
-						assert.equal(superMemberVarItem, null, "vscode.executeCompletionItemProvider failed to omit super static function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes file-internal variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let fileInternalVarItem = findCompletionItem("fileInternalVar", items);
-						assert.notEqual(fileInternalVarItem, null, "vscode.executeCompletionItemProvider failed to provide file-internal variable: " + uri);
-						assert.strictEqual(fileInternalVarItem.kind, vscode.CompletionItemKind.Variable, "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits file-internal variable with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let fileInternalVarItem = findCompletionItem("fileInternalVar", items);
-						assert.equal(fileInternalVarItem, null, "vscode.executeCompletionItemProvider failed to omit file-internal variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits file-internal variable from type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberVarItem = findCompletionItem("fileInternalVar", items);
-						assert.equal(superMemberVarItem, null, "vscode.executeCompletionItemProvider failed to omit file-internal variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes file-internal function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let fileInternalFunctionItem = findCompletionItem("fileInternalFunction", items);
-						assert.notEqual(fileInternalFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide file-internal function: " + uri);
-						assert.strictEqual(fileInternalFunctionItem.kind, vscode.CompletionItemKind.Function, "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits file-internal function with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let fileInternalFunctionItem = findCompletionItem("fileInternalFunction", items);
-						assert.equal(fileInternalFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit file-internal function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits file-internal function from type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider",
-				uri, position, ".")
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let superMemberVarItem = findCompletionItem("fileInternalFunction", items);
-						assert.equal(superMemberVarItem, null, "vscode.executeCompletionItemProvider failed to omit file-internal function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(46, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let fileInternalClassItem = findCompletionItem("FileInternalCompletion", items);
-						assert.notEqual(fileInternalClassItem, null, "vscode.executeCompletionItemProvider failed to provide file-internal class: " + uri);
-						assert.strictEqual(fileInternalClassItem.kind, vscode.CompletionItemKind.Class, "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal class: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes file-internal class as type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let fileInternalClassItem = findCompletionItem("FileInternalCompletion", items);
-						assert.notEqual(fileInternalClassItem, null, "vscode.executeCompletionItemProvider failed to provide file-internal class: " + uri);
-						assert.strictEqual(fileInternalClassItem.kind, vscode.CompletionItemKind.Class, "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal class: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes file-internal member variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(53, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let fileInternalMemberVarItem = findCompletionItem("fileInternalMemberVar", items);
-						assert.notEqual(fileInternalMemberVarItem, null, "vscode.executeCompletionItemProvider failed to provide file-internal member variable: " + uri);
-						assert.strictEqual(fileInternalMemberVarItem.kind, vscode.CompletionItemKind.Field, "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal member variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes file-internal member function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(53, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let fileInternalMemberFunctionItem = findCompletionItem("fileInternalMemberFunction", items);
-						assert.notEqual(fileInternalMemberFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide file-internal member function: " + uri);
-						assert.strictEqual(fileInternalMemberFunctionItem.kind, vscode.CompletionItemKind.Method, "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal member function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes file-internal member property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(53, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let fileInternalMemberPropertyItem = findCompletionItem("fileInternalMemberProperty", items);
-						assert.notEqual(fileInternalMemberPropertyItem, null, "vscode.executeCompletionItemProvider failed to provide file-internal member property: " + uri);
-						assert.strictEqual(fileInternalMemberPropertyItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal member property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes file-internal static variable", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(54, 26);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let fileInternalStaticVarItem = findCompletionItem("fileInternalStaticVar", items);
-						assert.notEqual(fileInternalStaticVarItem, null, "vscode.executeCompletionItemProvider failed to provide file-internal static variable: " + uri);
-						assert.strictEqual(fileInternalStaticVarItem.kind, vscode.CompletionItemKind.Field, "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal static variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes file-internal static function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(54, 26);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let fileInternalStaticFunctionItem = findCompletionItem("fileInternalStaticFunction", items);
-						assert.notEqual(fileInternalStaticFunctionItem, null, "vscode.executeCompletionItemProvider failed to provide file-internal static function: " + uri);
-						assert.strictEqual(fileInternalStaticFunctionItem.kind, vscode.CompletionItemKind.Method, "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal static function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes file-internal static property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(54, 26);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let fileInternalStaticPropertyItem = findCompletionItem("fileInternalStaticProperty", items);
-						assert.notEqual(fileInternalStaticPropertyItem, null, "vscode.executeCompletionItemProvider failed to provide file-internal static property: " + uri);
-						assert.strictEqual(fileInternalStaticPropertyItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal static property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits protected member variable not in superclass", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(53, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let protectedMemberVarItem = findCompletionItem("protectedMemberVar", items);
-						assert.equal(protectedMemberVarItem, null, "vscode.executeCompletionItemProvider failed to omit protected member variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits protected member function not in superclass", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(53, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let protectedMemberFunctionItem = findCompletionItem("protectedMemberFunction", items);
-						assert.equal(protectedMemberFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit protected member function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits protected member property not in superclass", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(53, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let protectedMemberPropertyItem = findCompletionItem("protectedMemberProperty", items);
-						assert.equal(protectedMemberPropertyItem, null, "vscode.executeCompletionItemProvider failed to omit protected member property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits protected static variable not in superclass", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(54, 26);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let protectedStaticVarItem = findCompletionItem("protectedStaticVar", items);
-						assert.equal(protectedStaticVarItem, null, "vscode.executeCompletionItemProvider failed to omit protected static variable: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits protected static function not in superclass", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(54, 26);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let protectedStaticFunctionItem = findCompletionItem("protectedStaticFunction", items);
-						assert.equal(protectedStaticFunctionItem, null, "vscode.executeCompletionItemProvider failed to omit protected static function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits protected static property not in superclass", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(54, 26);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let protectedStaticPropertyItem = findCompletionItem("protectedStaticProperty", items);
-						assert.equal(protectedStaticPropertyItem, null, "vscode.executeCompletionItemProvider failed to omit protected static property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes class on left side of member access for static constant", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(56, 21);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let classItem = findCompletionItem("ClassWithConstants", items);
-						assert.notEqual(classItem, null, "vscode.executeCompletionItemProvider failed to provide class: " + uri);
-						assert.strictEqual(classItem.kind, vscode.CompletionItemKind.Class, "vscode.executeCompletionItemProvider failed to provide correct kind of class: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes package interface with member access on fully-qualified package", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(50, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let interfaceItem = findCompletionItem("IPackageInterface", items);
-						assert.notEqual(interfaceItem, null, "vscode.executeCompletionItemProvider failed to provide package interface: " + uri);
-						assert.strictEqual(interfaceItem.kind, vscode.CompletionItemKind.Interface, "vscode.executeCompletionItemProvider failed to provide correct kind of package interface: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits package interface with member access operator on this", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(47, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localVarItem = findCompletionItem("IPackageInterface", items);
-						assert.equal(localVarItem, null, "vscode.executeCompletionItemProvider failed to omit package interface: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits package interface with member access operator on super", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(48, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let localVarItem = findCompletionItem("IPackageInterface", items);
-						assert.equal(localVarItem, null, "vscode.executeCompletionItemProvider failed to omit package interface: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes package interface as type annotation", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(55, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let packageInterfaceItem = findCompletionItem("IPackageInterface", items);
-						assert.notEqual(packageInterfaceItem, null, "vscode.executeCompletionItemProvider failed to provide package interface: " + uri);
-						assert.strictEqual(packageInterfaceItem.kind, vscode.CompletionItemKind.Interface, "vscode.executeCompletionItemProvider failed to provide correct kind of package interface: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes interface member property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(58, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("memberProperty", items);
-						assert.notEqual(propertyItem, null, "vscode.executeCompletionItemProvider failed to provide member property: " + uri);
-						assert.strictEqual(propertyItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of member property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes interface member function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(58, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let functionItem = findCompletionItem("memberFunction", items);
-						assert.notEqual(functionItem, null, "vscode.executeCompletionItemProvider failed to provide member function: " + uri);
-						assert.strictEqual(functionItem.kind, vscode.CompletionItemKind.Method, "vscode.executeCompletionItemProvider failed to provide correct kind of member function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes interface super member property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(58, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("superMemberProperty", items);
-						assert.notEqual(propertyItem, null, "vscode.executeCompletionItemProvider failed to provide super member property: " + uri);
-						assert.strictEqual(propertyItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of super member property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes interface super member function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(58, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let functionItem = findCompletionItem("superMemberFunction", items);
-						assert.notEqual(functionItem, null, "vscode.executeCompletionItemProvider failed to provide super member function: " + uri);
-						assert.strictEqual(functionItem.kind, vscode.CompletionItemKind.Method, "vscode.executeCompletionItemProvider failed to provide correct kind of super member function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes interface super super member property", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(58, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("superSuperMemberProperty", items);
-						assert.notEqual(propertyItem, null, "vscode.executeCompletionItemProvider failed to provide super super member property: " + uri);
-						assert.strictEqual(propertyItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of super super member property: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes interface super super member function", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(58, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let functionItem = findCompletionItem("superSuperMemberFunction", items);
-						assert.notEqual(functionItem, null, "vscode.executeCompletionItemProvider failed to provide super super member function: " + uri);
-						assert.strictEqual(functionItem.kind, vscode.CompletionItemKind.Method, "vscode.executeCompletionItemProvider failed to provide correct kind of super super member function: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider empty inside string literal", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(59, 33);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						assert.ok(!containsCompletionItemsOtherThanTextOrSnippet(list.items),
-							"vscode.executeCompletionItemProvider incorrectly provides items inside a string literal");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider empty inside RegExp literal", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(60, 33);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						assert.ok(!containsCompletionItemsOtherThanTextOrSnippet(list.items),
-							"vscode.executeCompletionItemProvider incorrectly provides items inside a RegExp literal");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes package name for package block", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "PackageCompletion.as"));
-		let position = new vscode.Position(0, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let packageItem = findCompletionItem("com.example", items);
-						assert.notEqual(packageItem, null, "vscode.executeCompletionItemProvider failed to provide package name: " + uri);
-						assert.strictEqual(packageItem.kind, vscode.CompletionItemKind.Module, "vscode.executeCompletionItemProvider failed to provide correct kind of package name: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes package name at end of package keyword", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "PackageCompletion4.as"));
-		let position = new vscode.Position(0, 7);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let packageItem = findCompletionItem("package com.example {}", items);
-						assert.notEqual(packageItem, null, "vscode.executeCompletionItemProvider failed to provide package name: " + uri);
-						assert.strictEqual(packageItem.kind, vscode.CompletionItemKind.Module, "vscode.executeCompletionItemProvider failed to provide correct kind of package name: " + uri);
-						let snippet = packageItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "package com.example\n{\n\t$0\n}", "vscode.executeCompletionItemProvider failed to provide correct insert text for package name: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes package name for unfinished package block", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "PackageCompletion2.as"));
-		let position = new vscode.Position(0, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let packageItem = findCompletionItem("com.example", items);
-						assert.notEqual(packageItem, null, "vscode.executeCompletionItemProvider failed to provide package name: " + uri);
-						assert.strictEqual(packageItem.kind, vscode.CompletionItemKind.Module, "vscode.executeCompletionItemProvider failed to provide correct kind of package name: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes package name for empty file", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "PackageCompletion3.as"));
-		let position = new vscode.Position(0, 0);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let packageItem = findCompletionItem("package com.example {}", items);
-						assert.notEqual(packageItem, null, "vscode.executeCompletionItemProvider failed to provide package name: " + uri);
-						assert.strictEqual(packageItem.kind, vscode.CompletionItemKind.Module, "vscode.executeCompletionItemProvider failed to provide correct kind of package name: " + uri);
-						let snippet = packageItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "package com.example\n{\n\t$0\n}", "vscode.executeCompletionItemProvider failed to provide correct insert text for package name: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes protected member function on protected override", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(63, 30);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let functionItem = findCompletionItem("superMemberFunction", items);
-						assert.notEqual(functionItem, null, "vscode.executeCompletionItemProvider failed to provide protected member function on protected override " + uri);
-						assert.strictEqual(functionItem.kind, vscode.CompletionItemKind.Method, "vscode.executeCompletionItemProvider failed to provide correct kind of override: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider excludes public member function on protected override", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Completion.as"));
-		let position = new vscode.Position(63, 30);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let functionItem = findCompletionItem("superMemberFunction2", items);
-						assert.equal(functionItem, null, "vscode.executeCompletionItemProvider incorrectly provided public member function on protected override: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
+suite("completion item provider: Application workspace", () => {
+  suiteTeardown(revertAndCloseAllEditors);
+  test("vscode.executeCompletionItemProvider includes local variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localVarItem = findCompletionItem("localVar", items);
+            assert.notEqual(
+              localVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide local variable: " +
+                uri
+            );
+            assert.strictEqual(
+              localVarItem.kind,
+              vscode.CompletionItemKind.Variable,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of local variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits local variable with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(49, 14);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localVarItem = findCompletionItem("localVar", items);
+            assert.equal(
+              localVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit local variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits local variable with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localVarItem = findCompletionItem("localVar", items);
+            assert.equal(
+              localVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit local variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits local variable with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localVarItem = findCompletionItem("localVar", items);
+            assert.equal(
+              localVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit local variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits local variable with member access operator on fully-qualified package", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(51, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localVarItem = findCompletionItem("localVar", items);
+            assert.equal(
+              localVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit local variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits local variable from type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberVarItem = findCompletionItem("localVar", items);
+            assert.equal(
+              superMemberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit local variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes local function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localFunctionItem = findCompletionItem("localFunction", items);
+            assert.notEqual(
+              localFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide local function: " +
+                uri
+            );
+            assert.strictEqual(
+              localFunctionItem.kind,
+              vscode.CompletionItemKind.Function,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of local function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits local function with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(49, 14);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localFunctionItem = findCompletionItem("localFunction", items);
+            assert.equal(
+              localFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit local function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits local function with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localFunctionItem = findCompletionItem("localFunction", items);
+            assert.equal(
+              localFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit local function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits local function with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localVarItem = findCompletionItem("localFunction", items);
+            assert.equal(
+              localVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit local function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits local function with member access operator on fully-qualified package", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(51, 51);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localFunctionItem = findCompletionItem("localFunction", items);
+            assert.equal(
+              localFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit local function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits local function from type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberVarItem = findCompletionItem("localFunction", items);
+            assert.equal(
+              superMemberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit local function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes member variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberVarItem = findCompletionItem("memberVar", items);
+            assert.notEqual(
+              memberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide member variable: " +
+                uri
+            );
+            assert.strictEqual(
+              memberVarItem.kind,
+              vscode.CompletionItemKind.Field,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of member variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits member variable with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(49, 14);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberVarItem = findCompletionItem("memberVar", items);
+            assert.equal(
+              memberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit member variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes member variable with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberVarItem = findCompletionItem("memberVar", items);
+            assert.notEqual(
+              memberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide member variable: " +
+                uri
+            );
+            assert.strictEqual(
+              memberVarItem.kind,
+              vscode.CompletionItemKind.Field,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of member variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits member variable with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberVarItem = findCompletionItem("memberVar", items);
+            assert.equal(
+              memberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit member variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits member variable with member access operator on fully-qualified package", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(51, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberVarItem = findCompletionItem("memberVar", items);
+            assert.equal(
+              memberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit member variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits member variable from type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberVarItem = findCompletionItem("memberVar", items);
+            assert.equal(
+              superMemberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit member variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes member function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberFunctionItem = findCompletionItem(
+              "memberFunction",
+              items
+            );
+            assert.notEqual(
+              memberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide member function: " +
+                uri
+            );
+            assert.strictEqual(
+              memberFunctionItem.kind,
+              vscode.CompletionItemKind.Method,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of member function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits member function with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(49, 14);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberFunctionItem = findCompletionItem(
+              "memberFunction",
+              items
+            );
+            assert.equal(
+              memberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit member variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes member function with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberFunctionItem = findCompletionItem(
+              "memberFunction",
+              items
+            );
+            assert.notEqual(
+              memberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide member function: " +
+                uri
+            );
+            assert.strictEqual(
+              memberFunctionItem.kind,
+              vscode.CompletionItemKind.Method,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of member function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits member function with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberFunctionItem = findCompletionItem(
+              "memberFunction",
+              items
+            );
+            assert.equal(
+              memberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit member variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits member function with member access operator on fully-qualified package", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(51, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberFunctionItem = findCompletionItem(
+              "memberFunction",
+              items
+            );
+            assert.equal(
+              memberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit member variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits member function from type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberFunctionItem = findCompletionItem(
+              "memberFunction",
+              items
+            );
+            assert.equal(
+              memberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit member function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes member property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberPropItem = findCompletionItem("memberProperty", items);
+            assert.notEqual(
+              memberPropItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide member property: " +
+                uri
+            );
+            assert.strictEqual(
+              memberPropItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of member property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits member property with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(49, 14);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberPropItem = findCompletionItem("memberProperty", items);
+            assert.equal(
+              memberPropItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit member property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes member property with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberPropItem = findCompletionItem("memberProperty", items);
+            assert.notEqual(
+              memberPropItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide member property: " +
+                uri
+            );
+            assert.strictEqual(
+              memberPropItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of member property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits member property with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberPropItem = findCompletionItem("memberProperty", items);
+            assert.equal(
+              memberPropItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit member property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits member property with member access operator on fully-qualified package", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(51, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberPropItem = findCompletionItem("memberProperty", items);
+            assert.equal(
+              memberPropItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit member property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits member property from type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let memberPropItem = findCompletionItem("memberProperty", items);
+            assert.equal(
+              memberPropItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit member property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes static variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticVarItem = findCompletionItem("staticVar", items);
+            assert.notEqual(
+              staticVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide static variable: " +
+                uri
+            );
+            assert.strictEqual(
+              staticVarItem.kind,
+              vscode.CompletionItemKind.Field,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of static variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes static variable with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(49, 14);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticVarItem = findCompletionItem("staticVar", items);
+            assert.notEqual(
+              staticVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide static variable: " +
+                uri
+            );
+            assert.strictEqual(
+              staticVarItem.kind,
+              vscode.CompletionItemKind.Field,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of static variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits static variable with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticVarItem = findCompletionItem("staticVar", items);
+            assert.equal(
+              staticVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit static variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits static variable with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticVarItem = findCompletionItem("staticVar", items);
+            assert.equal(
+              staticVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit static variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits static variable with member access operator on fully-qualified package", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(51, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticVarItem = findCompletionItem("staticVar", items);
+            assert.equal(
+              staticVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit static variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits static variable from type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticVarItem = findCompletionItem("staticVar", items);
+            assert.equal(
+              staticVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit static variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes static function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticFunctionItem = findCompletionItem(
+              "staticFunction",
+              items
+            );
+            assert.notEqual(
+              staticFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide static function: " +
+                uri
+            );
+            assert.strictEqual(
+              staticFunctionItem.kind,
+              vscode.CompletionItemKind.Method,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of static function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes static function with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(49, 14);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticFunctionItem = findCompletionItem(
+              "staticFunction",
+              items
+            );
+            assert.notEqual(
+              staticFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide static function: " +
+                uri
+            );
+            assert.strictEqual(
+              staticFunctionItem.kind,
+              vscode.CompletionItemKind.Method,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of static function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits static function with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticFunctionItem = findCompletionItem(
+              "staticFunction",
+              items
+            );
+            assert.equal(
+              staticFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit static function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits static function with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticFunctionItem = findCompletionItem(
+              "staticFunction",
+              items
+            );
+            assert.equal(
+              staticFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit static function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits static function with member access operator on fully-qualified package", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(51, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticFunctionItem = findCompletionItem(
+              "staticFunction",
+              items
+            );
+            assert.equal(
+              staticFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit static function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits static function from type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticFunctionItem = findCompletionItem(
+              "staticFunction",
+              items
+            );
+            assert.equal(
+              staticFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit static function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes static property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticPropItem = findCompletionItem("staticProperty", items);
+            assert.notEqual(
+              staticPropItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide static property: " +
+                uri
+            );
+            assert.strictEqual(
+              staticPropItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of static property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes static property with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(49, 14);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticPropItem = findCompletionItem("staticProperty", items);
+            assert.notEqual(
+              staticPropItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide static property: " +
+                uri
+            );
+            assert.strictEqual(
+              staticPropItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of static property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits static property with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticPropItem = findCompletionItem("staticProperty", items);
+            assert.equal(
+              staticPropItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit static property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits static property with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticPropItem = findCompletionItem("staticProperty", items);
+            assert.equal(
+              staticPropItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit static property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits static property with member access operator on fully-qualified package", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(51, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticPropItem = findCompletionItem("staticProperty", items);
+            assert.equal(
+              staticPropItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit static property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits static property from type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let staticPropItem = findCompletionItem("staticProperty", items);
+            assert.equal(
+              staticPropItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit static property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes package class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let packageClassItem = findCompletionItem(
+              "UnreferencedClass",
+              items
+            );
+            assert.notEqual(
+              packageClassItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide package class: " +
+                uri
+            );
+            assert.strictEqual(
+              packageClassItem.kind,
+              vscode.CompletionItemKind.Class,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of package class: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes package class with member access on fully-qualified package", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(50, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let classItem = findCompletionItem("UnreferencedClass", items);
+            assert.notEqual(
+              classItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide package class: " +
+                uri
+            );
+            assert.strictEqual(
+              classItem.kind,
+              vscode.CompletionItemKind.Class,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of package class: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits package class with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localVarItem = findCompletionItem("UnreferencedClass", items);
+            assert.equal(
+              localVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit package class: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits package class with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localVarItem = findCompletionItem("UnreferencedClass", items);
+            assert.equal(
+              localVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit package class: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes package class as type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let packageClassItem = findCompletionItem(
+              "UnreferencedClass",
+              items
+            );
+            assert.notEqual(
+              packageClassItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide package class: " +
+                uri
+            );
+            assert.strictEqual(
+              packageClassItem.kind,
+              vscode.CompletionItemKind.Class,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of package class: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes package variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let packageVarItem = findCompletionItem("packageVar", items);
+            assert.notEqual(
+              packageVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide package variable: " +
+                uri
+            );
+            assert.strictEqual(
+              packageVarItem.kind,
+              vscode.CompletionItemKind.Variable,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of package variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes package variable with member access on fully-qualified package", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(50, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let packageVarItem = findCompletionItem("packageVar", items);
+            assert.notEqual(
+              packageVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide package variable: " +
+                uri
+            );
+            assert.strictEqual(
+              packageVarItem.kind,
+              vscode.CompletionItemKind.Variable,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of package variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits package variable with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localVarItem = findCompletionItem("packageVar", items);
+            assert.equal(
+              localVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit package variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits package variable with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localVarItem = findCompletionItem("packageVar", items);
+            assert.equal(
+              localVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit package variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits package variable as type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let packageClassItem = findCompletionItem("packageVar", items);
+            assert.equal(
+              packageClassItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omits package variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes package function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let packageFunctionItem = findCompletionItem(
+              "packageFunction",
+              items
+            );
+            assert.notEqual(
+              packageFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide package function: " +
+                uri
+            );
+            assert.strictEqual(
+              packageFunctionItem.kind,
+              vscode.CompletionItemKind.Function,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of package function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes package function with member access on fully-qualified package", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(50, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let packageFunctionItem = findCompletionItem(
+              "packageFunction",
+              items
+            );
+            assert.notEqual(
+              packageFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide package function: " +
+                uri
+            );
+            assert.strictEqual(
+              packageFunctionItem.kind,
+              vscode.CompletionItemKind.Function,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of package function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits package function with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localVarItem = findCompletionItem("packageFunction", items);
+            assert.equal(
+              localVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit package function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits package function with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localVarItem = findCompletionItem("packageFunction", items);
+            assert.equal(
+              localVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit package function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits package function as type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let packageClassItem = findCompletionItem("packageFunction", items);
+            assert.equal(
+              packageClassItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omits package function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super member variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberVarItem = findCompletionItem(
+              "superMemberVar",
+              items
+            );
+            assert.notEqual(
+              superMemberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super member variable: " +
+                uri
+            );
+            assert.strictEqual(
+              superMemberVarItem.kind,
+              vscode.CompletionItemKind.Field,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super member variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super member variable with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberVarItem = findCompletionItem(
+              "superMemberVar",
+              items
+            );
+            assert.notEqual(
+              superMemberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super member variable: " +
+                uri
+            );
+            assert.strictEqual(
+              superMemberVarItem.kind,
+              vscode.CompletionItemKind.Field,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super member variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits super member variable from type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberVarItem = findCompletionItem(
+              "superMemberVar",
+              items
+            );
+            assert.equal(
+              superMemberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit super member variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super member variable with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberVarItem = findCompletionItem(
+              "superMemberVar",
+              items
+            );
+            assert.notEqual(
+              superMemberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide member super variable: " +
+                uri
+            );
+            assert.strictEqual(
+              superMemberVarItem.kind,
+              vscode.CompletionItemKind.Field,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super member variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super member property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberPropertyItem = findCompletionItem(
+              "superMemberProperty",
+              items
+            );
+            assert.notEqual(
+              superMemberPropertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super member property: " +
+                uri
+            );
+            assert.strictEqual(
+              superMemberPropertyItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super member property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super member property with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberPropertyItem = findCompletionItem(
+              "superMemberProperty",
+              items
+            );
+            assert.notEqual(
+              superMemberPropertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super member property: " +
+                uri
+            );
+            assert.strictEqual(
+              superMemberPropertyItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super member property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super member property with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberPropertyItem = findCompletionItem(
+              "superMemberProperty",
+              items
+            );
+            assert.notEqual(
+              superMemberPropertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super member property: " +
+                uri
+            );
+            assert.strictEqual(
+              superMemberPropertyItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super member property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits super member property from type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberVarItem = findCompletionItem(
+              "superMemberProperty",
+              items
+            );
+            assert.equal(
+              superMemberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit super member property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super member function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberFunctionItem = findCompletionItem(
+              "superMemberFunction",
+              items
+            );
+            assert.notEqual(
+              superMemberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super member function: " +
+                uri
+            );
+            assert.strictEqual(
+              superMemberFunctionItem.kind,
+              vscode.CompletionItemKind.Method,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super member function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super member function with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberFunctionItem = findCompletionItem(
+              "superMemberFunction",
+              items
+            );
+            assert.notEqual(
+              superMemberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super member function: " +
+                uri
+            );
+            assert.strictEqual(
+              superMemberFunctionItem.kind,
+              vscode.CompletionItemKind.Method,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super member function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super member function with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberFunctionItem = findCompletionItem(
+              "superMemberFunction",
+              items
+            );
+            assert.notEqual(
+              superMemberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super member function: " +
+                uri
+            );
+            assert.strictEqual(
+              superMemberFunctionItem.kind,
+              vscode.CompletionItemKind.Method,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super member function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits super member function from type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberVarItem = findCompletionItem(
+              "superMemberFunction",
+              items
+            );
+            assert.equal(
+              superMemberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit super member function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super static variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superStaticVarItem = findCompletionItem(
+              "superStaticVar",
+              items
+            );
+            assert.notEqual(
+              superStaticVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super static variable: " +
+                uri
+            );
+            assert.strictEqual(
+              superStaticVarItem.kind,
+              vscode.CompletionItemKind.Field,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super static variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits super static variable with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(49, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superStaticVarItem = findCompletionItem(
+              "superStaticVar",
+              items
+            );
+            assert.equal(
+              superStaticVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit super static variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super static variable with member access operator on superclass", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(50, 20);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superStaticVarItem = findCompletionItem(
+              "superStaticVar",
+              items
+            );
+            assert.notEqual(
+              superStaticVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super static variable: " +
+                uri
+            );
+            assert.strictEqual(
+              superStaticVarItem.kind,
+              vscode.CompletionItemKind.Field,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super static variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super static variable with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberFunctionItem = findCompletionItem(
+              "superStaticVar",
+              items
+            );
+            assert.equal(
+              superMemberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit super static variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits super static variable with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberFunctionItem = findCompletionItem(
+              "superStaticVar",
+              items
+            );
+            assert.equal(
+              superMemberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super static variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits super static variable from type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberVarItem = findCompletionItem(
+              "superStaticVar",
+              items
+            );
+            assert.equal(
+              superMemberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit super static variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super static property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superStaticPropertyItem = findCompletionItem(
+              "superStaticProperty",
+              items
+            );
+            assert.notEqual(
+              superStaticPropertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super static property: " +
+                uri
+            );
+            assert.strictEqual(
+              superStaticPropertyItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super static property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits super static property with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(49, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superStaticPropertyItem = findCompletionItem(
+              "superStaticProperty",
+              items
+            );
+            assert.equal(
+              superStaticPropertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit super static property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super static property with member access operator on superclass", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(50, 20);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superStaticPropertyItem = findCompletionItem(
+              "superStaticProperty",
+              items
+            );
+            assert.notEqual(
+              superStaticPropertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super static property: " +
+                uri
+            );
+            assert.strictEqual(
+              superStaticPropertyItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super static property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super static property with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberFunctionItem = findCompletionItem(
+              "superStaticProperty",
+              items
+            );
+            assert.equal(
+              superMemberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit super static property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits super static property with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberFunctionItem = findCompletionItem(
+              "superStaticProperty",
+              items
+            );
+            assert.equal(
+              superMemberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super static property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits super static property from type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberVarItem = findCompletionItem(
+              "superStaticProperty",
+              items
+            );
+            assert.equal(
+              superMemberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit super static property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super static function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superStaticFunctionItem = findCompletionItem(
+              "superStaticFunction",
+              items
+            );
+            assert.notEqual(
+              superStaticFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super static function: " +
+                uri
+            );
+            assert.strictEqual(
+              superStaticFunctionItem.kind,
+              vscode.CompletionItemKind.Method,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super static function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits super static function with member access operator on class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(49, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superStaticFunctionItem = findCompletionItem(
+              "superStaticFunction",
+              items
+            );
+            assert.equal(
+              superStaticFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit super static function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super static function with member access operator on superclass", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(50, 20);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superStaticFunctionItem = findCompletionItem(
+              "superStaticFunction",
+              items
+            );
+            assert.notEqual(
+              superStaticFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super static function: " +
+                uri
+            );
+            assert.strictEqual(
+              superStaticFunctionItem.kind,
+              vscode.CompletionItemKind.Method,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super static function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes super static function with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberFunctionItem = findCompletionItem(
+              "superStaticFunction",
+              items
+            );
+            assert.equal(
+              superMemberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit super static function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits super static function with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberFunctionItem = findCompletionItem(
+              "superStaticFunction",
+              items
+            );
+            assert.equal(
+              superMemberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super static function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits super static function from type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberVarItem = findCompletionItem(
+              "superStaticFunction",
+              items
+            );
+            assert.equal(
+              superMemberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit super static function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes file-internal variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let fileInternalVarItem = findCompletionItem(
+              "fileInternalVar",
+              items
+            );
+            assert.notEqual(
+              fileInternalVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide file-internal variable: " +
+                uri
+            );
+            assert.strictEqual(
+              fileInternalVarItem.kind,
+              vscode.CompletionItemKind.Variable,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits file-internal variable with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let fileInternalVarItem = findCompletionItem(
+              "fileInternalVar",
+              items
+            );
+            assert.equal(
+              fileInternalVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit file-internal variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits file-internal variable from type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberVarItem = findCompletionItem(
+              "fileInternalVar",
+              items
+            );
+            assert.equal(
+              superMemberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit file-internal variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes file-internal function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let fileInternalFunctionItem = findCompletionItem(
+              "fileInternalFunction",
+              items
+            );
+            assert.notEqual(
+              fileInternalFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide file-internal function: " +
+                uri
+            );
+            assert.strictEqual(
+              fileInternalFunctionItem.kind,
+              vscode.CompletionItemKind.Function,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits file-internal function with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let fileInternalFunctionItem = findCompletionItem(
+              "fileInternalFunction",
+              items
+            );
+            assert.equal(
+              fileInternalFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit file-internal function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits file-internal function from type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeCompletionItemProvider",
+          uri,
+          position,
+          "."
+        )
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let superMemberVarItem = findCompletionItem(
+              "fileInternalFunction",
+              items
+            );
+            assert.equal(
+              superMemberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit file-internal function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes file-internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(46, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let fileInternalClassItem = findCompletionItem(
+              "FileInternalCompletion",
+              items
+            );
+            assert.notEqual(
+              fileInternalClassItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide file-internal class: " +
+                uri
+            );
+            assert.strictEqual(
+              fileInternalClassItem.kind,
+              vscode.CompletionItemKind.Class,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal class: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes file-internal class as type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let fileInternalClassItem = findCompletionItem(
+              "FileInternalCompletion",
+              items
+            );
+            assert.notEqual(
+              fileInternalClassItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide file-internal class: " +
+                uri
+            );
+            assert.strictEqual(
+              fileInternalClassItem.kind,
+              vscode.CompletionItemKind.Class,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal class: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes file-internal member variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(53, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let fileInternalMemberVarItem = findCompletionItem(
+              "fileInternalMemberVar",
+              items
+            );
+            assert.notEqual(
+              fileInternalMemberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide file-internal member variable: " +
+                uri
+            );
+            assert.strictEqual(
+              fileInternalMemberVarItem.kind,
+              vscode.CompletionItemKind.Field,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal member variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes file-internal member function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(53, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let fileInternalMemberFunctionItem = findCompletionItem(
+              "fileInternalMemberFunction",
+              items
+            );
+            assert.notEqual(
+              fileInternalMemberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide file-internal member function: " +
+                uri
+            );
+            assert.strictEqual(
+              fileInternalMemberFunctionItem.kind,
+              vscode.CompletionItemKind.Method,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal member function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes file-internal member property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(53, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let fileInternalMemberPropertyItem = findCompletionItem(
+              "fileInternalMemberProperty",
+              items
+            );
+            assert.notEqual(
+              fileInternalMemberPropertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide file-internal member property: " +
+                uri
+            );
+            assert.strictEqual(
+              fileInternalMemberPropertyItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal member property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes file-internal static variable", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(54, 26);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let fileInternalStaticVarItem = findCompletionItem(
+              "fileInternalStaticVar",
+              items
+            );
+            assert.notEqual(
+              fileInternalStaticVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide file-internal static variable: " +
+                uri
+            );
+            assert.strictEqual(
+              fileInternalStaticVarItem.kind,
+              vscode.CompletionItemKind.Field,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal static variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes file-internal static function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(54, 26);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let fileInternalStaticFunctionItem = findCompletionItem(
+              "fileInternalStaticFunction",
+              items
+            );
+            assert.notEqual(
+              fileInternalStaticFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide file-internal static function: " +
+                uri
+            );
+            assert.strictEqual(
+              fileInternalStaticFunctionItem.kind,
+              vscode.CompletionItemKind.Method,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal static function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes file-internal static property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(54, 26);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let fileInternalStaticPropertyItem = findCompletionItem(
+              "fileInternalStaticProperty",
+              items
+            );
+            assert.notEqual(
+              fileInternalStaticPropertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide file-internal static property: " +
+                uri
+            );
+            assert.strictEqual(
+              fileInternalStaticPropertyItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of file-internal static property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits protected member variable not in superclass", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(53, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let protectedMemberVarItem = findCompletionItem(
+              "protectedMemberVar",
+              items
+            );
+            assert.equal(
+              protectedMemberVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit protected member variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits protected member function not in superclass", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(53, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let protectedMemberFunctionItem = findCompletionItem(
+              "protectedMemberFunction",
+              items
+            );
+            assert.equal(
+              protectedMemberFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit protected member function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits protected member property not in superclass", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(53, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let protectedMemberPropertyItem = findCompletionItem(
+              "protectedMemberProperty",
+              items
+            );
+            assert.equal(
+              protectedMemberPropertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit protected member property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits protected static variable not in superclass", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(54, 26);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let protectedStaticVarItem = findCompletionItem(
+              "protectedStaticVar",
+              items
+            );
+            assert.equal(
+              protectedStaticVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit protected static variable: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits protected static function not in superclass", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(54, 26);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let protectedStaticFunctionItem = findCompletionItem(
+              "protectedStaticFunction",
+              items
+            );
+            assert.equal(
+              protectedStaticFunctionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit protected static function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits protected static property not in superclass", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(54, 26);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let protectedStaticPropertyItem = findCompletionItem(
+              "protectedStaticProperty",
+              items
+            );
+            assert.equal(
+              protectedStaticPropertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit protected static property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes class on left side of member access for static constant", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(56, 21);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let classItem = findCompletionItem("ClassWithConstants", items);
+            assert.notEqual(
+              classItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide class: " +
+                uri
+            );
+            assert.strictEqual(
+              classItem.kind,
+              vscode.CompletionItemKind.Class,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of class: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes package interface with member access on fully-qualified package", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(50, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let interfaceItem = findCompletionItem("IPackageInterface", items);
+            assert.notEqual(
+              interfaceItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide package interface: " +
+                uri
+            );
+            assert.strictEqual(
+              interfaceItem.kind,
+              vscode.CompletionItemKind.Interface,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of package interface: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits package interface with member access operator on this", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(47, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localVarItem = findCompletionItem("IPackageInterface", items);
+            assert.equal(
+              localVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit package interface: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits package interface with member access operator on super", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(48, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let localVarItem = findCompletionItem("IPackageInterface", items);
+            assert.equal(
+              localVarItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit package interface: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes package interface as type annotation", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(55, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let packageInterfaceItem = findCompletionItem(
+              "IPackageInterface",
+              items
+            );
+            assert.notEqual(
+              packageInterfaceItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide package interface: " +
+                uri
+            );
+            assert.strictEqual(
+              packageInterfaceItem.kind,
+              vscode.CompletionItemKind.Interface,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of package interface: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes interface member property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(58, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("memberProperty", items);
+            assert.notEqual(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide member property: " +
+                uri
+            );
+            assert.strictEqual(
+              propertyItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of member property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes interface member function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(58, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let functionItem = findCompletionItem("memberFunction", items);
+            assert.notEqual(
+              functionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide member function: " +
+                uri
+            );
+            assert.strictEqual(
+              functionItem.kind,
+              vscode.CompletionItemKind.Method,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of member function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes interface super member property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(58, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("superMemberProperty", items);
+            assert.notEqual(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super member property: " +
+                uri
+            );
+            assert.strictEqual(
+              propertyItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super member property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes interface super member function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(58, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let functionItem = findCompletionItem("superMemberFunction", items);
+            assert.notEqual(
+              functionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super member function: " +
+                uri
+            );
+            assert.strictEqual(
+              functionItem.kind,
+              vscode.CompletionItemKind.Method,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super member function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes interface super super member property", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(58, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem(
+              "superSuperMemberProperty",
+              items
+            );
+            assert.notEqual(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super super member property: " +
+                uri
+            );
+            assert.strictEqual(
+              propertyItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super super member property: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes interface super super member function", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(58, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let functionItem = findCompletionItem(
+              "superSuperMemberFunction",
+              items
+            );
+            assert.notEqual(
+              functionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide super super member function: " +
+                uri
+            );
+            assert.strictEqual(
+              functionItem.kind,
+              vscode.CompletionItemKind.Method,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of super super member function: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider empty inside string literal", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(59, 33);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            assert.ok(
+              !containsCompletionItemsOtherThanTextOrSnippet(list.items),
+              "vscode.executeCompletionItemProvider incorrectly provides items inside a string literal"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider empty inside RegExp literal", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(60, 33);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            assert.ok(
+              !containsCompletionItemsOtherThanTextOrSnippet(list.items),
+              "vscode.executeCompletionItemProvider incorrectly provides items inside a RegExp literal"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes package name for package block", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "PackageCompletion.as"
+      )
+    );
+    let position = new vscode.Position(0, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let packageItem = findCompletionItem("com.example", items);
+            assert.notEqual(
+              packageItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide package name: " +
+                uri
+            );
+            assert.strictEqual(
+              packageItem.kind,
+              vscode.CompletionItemKind.Module,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of package name: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes package name at end of package keyword", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "PackageCompletion4.as"
+      )
+    );
+    let position = new vscode.Position(0, 7);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let packageItem = findCompletionItem(
+              "package com.example {}",
+              items
+            );
+            assert.notEqual(
+              packageItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide package name: " +
+                uri
+            );
+            assert.strictEqual(
+              packageItem.kind,
+              vscode.CompletionItemKind.Module,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of package name: " +
+                uri
+            );
+            let snippet = packageItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "package com.example\n{\n\t$0\n}",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for package name: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes package name for unfinished package block", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "PackageCompletion2.as"
+      )
+    );
+    let position = new vscode.Position(0, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let packageItem = findCompletionItem("com.example", items);
+            assert.notEqual(
+              packageItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide package name: " +
+                uri
+            );
+            assert.strictEqual(
+              packageItem.kind,
+              vscode.CompletionItemKind.Module,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of package name: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes package name for empty file", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "PackageCompletion3.as"
+      )
+    );
+    let position = new vscode.Position(0, 0);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let packageItem = findCompletionItem(
+              "package com.example {}",
+              items
+            );
+            assert.notEqual(
+              packageItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide package name: " +
+                uri
+            );
+            assert.strictEqual(
+              packageItem.kind,
+              vscode.CompletionItemKind.Module,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of package name: " +
+                uri
+            );
+            let snippet = packageItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "package com.example\n{\n\t$0\n}",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for package name: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes protected member function on protected override", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(63, 30);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let functionItem = findCompletionItem("superMemberFunction", items);
+            assert.notEqual(
+              functionItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide protected member function on protected override " +
+                uri
+            );
+            assert.strictEqual(
+              functionItem.kind,
+              vscode.CompletionItemKind.Method,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of override: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider excludes public member function on protected override", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Completion.as"
+      )
+    );
+    let position = new vscode.Position(63, 30);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let functionItem = findCompletionItem(
+              "superMemberFunction2",
+              items
+            );
+            assert.equal(
+              functionItem,
+              null,
+              "vscode.executeCompletionItemProvider incorrectly provided public member function on protected override: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
 });
 
-suite("MXML completion item provider: Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeCompletionItemProvider includes property as attribute", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(9, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("className", items);
-						assert.notEqual(propertyItem, null, "vscode.executeCompletionItemProvider failed to provide property as attribute: " + uri);
-						assert.strictEqual(propertyItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of property: " + uri);
-						let snippet = propertyItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "className=\"$0\"", "vscode.executeCompletionItemProvider failed to provide correct insert text for property as attribute: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes property as child element (after < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(10, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("className", items);
-						assert.notEqual(propertyItem, null, "vscode.executeCompletionItemProvider failed to provide property as child element: " + uri);
-						assert.strictEqual(propertyItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of property: " + uri);
-						let snippet = propertyItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "js:className>$0</js:className>", "vscode.executeCompletionItemProvider failed to provide correct insert text for property as child element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes property as child element (without < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(24, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("className", items);
-						assert.notEqual(propertyItem, null, "vscode.executeCompletionItemProvider failed to provide property as child element: " + uri);
-						assert.strictEqual(propertyItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of property: " + uri);
-						let snippet = propertyItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "<js:className>$0</js:className>", "vscode.executeCompletionItemProvider failed to provide correct insert text for property as child element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes property as child element (after < bracket and existing prefix)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(14, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("className", items);
-						assert.notEqual(propertyItem, null, "vscode.executeCompletionItemProvider failed to provide property as child element: " + uri);
-						assert.strictEqual(propertyItem.kind, vscode.CompletionItemKind.Property, "vscode.executeCompletionItemProvider failed to provide correct kind of property: " + uri);
-						let snippet = propertyItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "className>$0</js:className>", "vscode.executeCompletionItemProvider failed to provide correct insert text for property as child element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits property as attribute of closing element", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(11, 14);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("className", items);
-						assert.equal(propertyItem, null, "vscode.executeCompletionItemProvider failed to omit property as attribute of closing element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes member variable as attribute", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(9, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("beads", items);
-						assert.notEqual(propertyItem, null, "vscode.executeCompletionItemProvider failed to provide member variable as attribute: " + uri);
-						assert.strictEqual(propertyItem.kind, vscode.CompletionItemKind.Field, "vscode.executeCompletionItemProvider failed to provide correct kind of member variable: " + uri);
-						let snippet = propertyItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "beads=\"$0\"", "vscode.executeCompletionItemProvider failed to provide correct insert text for member variable as attribute: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes member variable as child element (after < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(10, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("beads", items);
-						assert.notEqual(propertyItem, null, "vscode.executeCompletionItemProvider failed to provide member variable as child element: " + uri);
-						assert.strictEqual(propertyItem.kind, vscode.CompletionItemKind.Field, "vscode.executeCompletionItemProvider failed to provide correct kind of member variable: " + uri);
-						let snippet = propertyItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "js:beads>$0</js:beads>", "vscode.executeCompletionItemProvider failed to provide correct insert text for member variable as child element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes member variable as child element (without < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(24, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("beads", items);
-						assert.notEqual(propertyItem, null, "vscode.executeCompletionItemProvider failed to provide member variable as child element: " + uri);
-						assert.strictEqual(propertyItem.kind, vscode.CompletionItemKind.Field, "vscode.executeCompletionItemProvider failed to provide correct kind of member variable: " + uri);
-						let snippet = propertyItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "<js:beads>$0</js:beads>", "vscode.executeCompletionItemProvider failed to provide correct insert text for member variable as child element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes member variable as child element (after < bracket and exiting prefix)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(14, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("beads", items);
-						assert.notEqual(propertyItem, null, "vscode.executeCompletionItemProvider failed to provide member variable as child element: " + uri);
-						assert.strictEqual(propertyItem.kind, vscode.CompletionItemKind.Field, "vscode.executeCompletionItemProvider failed to provide correct kind of member variable: " + uri);
-						let snippet = propertyItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "beads>$0</js:beads>", "vscode.executeCompletionItemProvider failed to provide correct insert text for member variable as child element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits member variable as attribute of closing element", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(11, 14);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("beads", items);
-						assert.equal(propertyItem, null, "vscode.executeCompletionItemProvider failed to omit member variable as attribute of closing element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes event as attribute", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(9, 13);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let eventItem = findCompletionItem("click", items);
-						assert.notEqual(eventItem, null, "vscode.executeCompletionItemProvider failed to provide event as attribute: " + uri);
-						assert.strictEqual(eventItem.kind, vscode.CompletionItemKind.Event, "vscode.executeCompletionItemProvider failed to provide correct kind of event: " + uri);
-						let snippet = eventItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "click=\"$0\"", "vscode.executeCompletionItemProvider failed to provide correct insert text for event as attribute: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes event as child element (after < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(10, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let eventItem = findCompletionItem("click", items);
-						assert.notEqual(eventItem, null, "vscode.executeCompletionItemProvider failed to provide event as child element: " + uri);
-						assert.strictEqual(eventItem.kind, vscode.CompletionItemKind.Event, "vscode.executeCompletionItemProvider failed to provide correct kind of event: " + uri);
-						let snippet = eventItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "js:click>$0</js:click>", "vscode.executeCompletionItemProvider failed to provide correct insert text for event as child element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes event as child element (without < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(24, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let eventItem = findCompletionItem("click", items);
-						assert.notEqual(eventItem, null, "vscode.executeCompletionItemProvider failed to provide event as child element: " + uri);
-						assert.strictEqual(eventItem.kind, vscode.CompletionItemKind.Event, "vscode.executeCompletionItemProvider failed to provide correct kind of event: " + uri);
-						let snippet = eventItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "<js:click>$0</js:click>", "vscode.executeCompletionItemProvider failed to provide correct insert text for event as child element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes event as child element (after < bracket and existing prefix)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(14, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let eventItem = findCompletionItem("click", items);
-						assert.notEqual(eventItem, null, "vscode.executeCompletionItemProvider failed to provide event as child element: " + uri);
-						assert.strictEqual(eventItem.kind, vscode.CompletionItemKind.Event, "vscode.executeCompletionItemProvider failed to provide correct kind of event: " + uri);
-						let snippet = eventItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "click>$0</js:click>", "vscode.executeCompletionItemProvider failed to provide correct insert text for event as child element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits event as attribute of closing element", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(11, 14);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let eventItem = findCompletionItem("click", items);
-						assert.equal(eventItem, null, "vscode.executeCompletionItemProvider failed to omit event as attribute of closing element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes class as child element (after < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(10, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let packageClassItem = findCompletionItem("example:UnreferencedClass", items);
-						assert.notEqual(packageClassItem, null, "vscode.executeCompletionItemProvider failed to provide package class: " + uri);
-						assert.strictEqual(packageClassItem.kind, vscode.CompletionItemKind.Class, "vscode.executeCompletionItemProvider failed to provide correct kind of package class: " + uri);
-						assert.strictEqual(packageClassItem.sortText, "UnreferencedClass", "vscode.executeCompletionItemProvider failed to provide correct sort text for package class as child element: " + uri);
-						assert.strictEqual(packageClassItem.filterText, "UnreferencedClass", "vscode.executeCompletionItemProvider failed to provide correct filter text for package class as child element: " + uri);
-						assert.strictEqual(packageClassItem.insertText, "example:UnreferencedClass", "vscode.executeCompletionItemProvider failed to provide correct insert text for package class as child element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes class as child element (without < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(24, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let packageClassItem = findCompletionItem("example:UnreferencedClass", items);
-						assert.notEqual(packageClassItem, null, "vscode.executeCompletionItemProvider failed to provide package class: " + uri);
-						assert.strictEqual(packageClassItem.kind, vscode.CompletionItemKind.Class, "vscode.executeCompletionItemProvider failed to provide correct kind of package class: " + uri);
-						assert.strictEqual(packageClassItem.sortText, "UnreferencedClass", "vscode.executeCompletionItemProvider failed to provide correct sort text for package class as child element: " + uri);
-						assert.strictEqual(packageClassItem.filterText, "UnreferencedClass", "vscode.executeCompletionItemProvider failed to provide correct filter text for package class as child element: " + uri);
-						assert.strictEqual(packageClassItem.insertText, "<example:UnreferencedClass", "vscode.executeCompletionItemProvider failed to provide correct insert text for package class as child element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Binding> as child element of root (after < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(12, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Binding", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Binding>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Binding", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Binding>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Binding", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Binding>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "fx:Binding>\n\t$0\n</fx:Binding>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Binding>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Binding> as child element of root (without < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(26, 4);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Binding", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Binding>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Binding", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Binding>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Binding", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Binding>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "<fx:Binding>\n\t$0\n</fx:Binding>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Binding>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits <fx:Binding> as child of non-root element (after < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(10, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Binding", vscode.CompletionItemKind.Keyword, items);
-						assert.equal(mxmlItem, null, "vscode.executeCompletionItemProvider failed to omit <fx:Binding> in non-root element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits <fx:Binding> as child of non-root element (without < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(24, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Binding", vscode.CompletionItemKind.Keyword, items);
-						assert.equal(mxmlItem, null, "vscode.executeCompletionItemProvider failed to omit <fx:Binding> in non-root element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Binding> as child element of root with existing prefix", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(20, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Binding", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Binding>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Binding", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Binding>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Binding", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Binding>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "Binding>\n\t$0\n</fx:Binding>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Binding>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits <fx:Binding> as child of non-root element with existing prefix", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(18, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Binding", vscode.CompletionItemKind.Keyword, items);
-						assert.equal(mxmlItem, null, "vscode.executeCompletionItemProvider failed to omit <fx:Binding> in non-root element existing prefix: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Component> as child element of root (after < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(12, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Component", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Component>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Component", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Component", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "fx:Component>\n\t$0\n</fx:Component>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Component>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Component> as child element of root (without < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(26, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Component", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Component>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Component", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Component", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "<fx:Component>\n\t$0\n</fx:Component>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Component>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Component> as child of non-root element (after < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(10, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Component", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Component>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Component", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Component", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "fx:Component>\n\t$0\n</fx:Component>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Component>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Component> as child of non-root element (without < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(24, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Component", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Component>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Component", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Component", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "<fx:Component>\n\t$0\n</fx:Component>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Component>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Component> as child element of root with existing prefix", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(20, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Component", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Component>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Component", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Component", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "Component>\n\t$0\n</fx:Component>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Component>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Component> as child of non-root element with existing prefix", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(18, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Component", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Component>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Component", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Component", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "Component>\n\t$0\n</fx:Component>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Component>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Declarations> as child element of root (after < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(12, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Declarations", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Declarations>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Declarations", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Declarations>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Declarations", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Declarations>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "fx:Declarations>\n\t$0\n</fx:Declarations>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Declarations>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Declarations> as child element of root (without < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(26, 4);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Declarations", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Declarations>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Declarations", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Declarations>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Declarations", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Declarations>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "<fx:Declarations>\n\t$0\n</fx:Declarations>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Declarations>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits <fx:Declarations> as child of non-root element (after < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(10, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Declarations", vscode.CompletionItemKind.Keyword, items);
-						assert.equal(mxmlItem, null, "vscode.executeCompletionItemProvider failed to omit <fx:Declarations> in non-root element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits <fx:Declarations> as child of non-root element (without < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(24, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Declarations", vscode.CompletionItemKind.Keyword, items);
-						assert.equal(mxmlItem, null, "vscode.executeCompletionItemProvider failed to omit <fx:Declarations> in non-root element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Declarations> as child element of root with existing prefix", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(20, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Declarations", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Declarations>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Declarations", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Declarations>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Declarations", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Declarations>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "Declarations>\n\t$0\n</fx:Declarations>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Declarations>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits <fx:Declarations> as child of non-root element with existing prefix", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(18, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Declarations", vscode.CompletionItemKind.Keyword, items);
-						assert.equal(mxmlItem, null, "vscode.executeCompletionItemProvider failed to omit <fx:Declarations> in non-root element existing prefix: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Metadata> as child element of root (after < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(12, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Metadata", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Metadata>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Metadata", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Metadata>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Metadata", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Metadata>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "fx:Metadata>\n\t$0\n</fx:Metadata>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Metadata>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Metadata> as child element of root (without < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(26, 4);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Metadata", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Metadata>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Metadata", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Metadata>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Metadata", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Metadata>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "<fx:Metadata>\n\t$0\n</fx:Metadata>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Metadata>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits <fx:Metadata> as child of non-root element (after < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(10, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Metadata", vscode.CompletionItemKind.Keyword, items);
-						assert.equal(mxmlItem, null, "vscode.executeCompletionItemProvider failed to omit <fx:Metadata> in non-root element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits <fx:Metadata> as child of non-root element (without < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(24, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Metadata", vscode.CompletionItemKind.Keyword, items);
-						assert.equal(mxmlItem, null, "vscode.executeCompletionItemProvider failed to omit <fx:Metadata> in non-root element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Metadata> as child element of root with existing prefix", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(20, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Metadata", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Metadata>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Metadata", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Metadata>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Metadata", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Metadata>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "Metadata>\n\t$0\n</fx:Metadata>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Metadata>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits <fx:Metadata> as child of non-root element with existing prefix", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(18, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Metadata", vscode.CompletionItemKind.Keyword, items);
-						assert.equal(mxmlItem, null, "vscode.executeCompletionItemProvider failed to omit <fx:Metadata> in non-root element existing prefix: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Script> as child element of root (after < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(12, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Script", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Script>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Script", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Script>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Script", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Script>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "fx:Script>\n\t<![CDATA[\n\t\t$0\n\t]]>\n</fx:Script>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Script>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Script> as child element of root (without < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(26, 4);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Script", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Script>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Script", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Script>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Script", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Script>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "<fx:Script>\n\t<![CDATA[\n\t\t$0\n\t]]>\n</fx:Script>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Script>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits <fx:Script> as child of non-root element (after < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(10, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Script", vscode.CompletionItemKind.Keyword, items);
-						assert.equal(mxmlItem, null, "vscode.executeCompletionItemProvider failed to omit <fx:Script> in non-root element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits <fx:Script> as child of non-root element (without < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(24, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Script", vscode.CompletionItemKind.Keyword, items);
-						assert.equal(mxmlItem, null, "vscode.executeCompletionItemProvider failed to omit <fx:Script> in non-root element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Script> as child element of root with existing prefix", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(20, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Script", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Script>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Script", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Script>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Script", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Script>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "Script>\n\t<![CDATA[\n\t\t$0\n\t]]>\n</fx:Script>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Script>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits <fx:Script> as child of non-root element with existing prefix", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(18, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Script", vscode.CompletionItemKind.Keyword, items);
-						assert.equal(mxmlItem, null, "vscode.executeCompletionItemProvider failed to omit <fx:Script> in non-root element existing prefix: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Style> as child element of root (after < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(12, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Style", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Style>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Style", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Style>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Style", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Style>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "fx:Style>\n\t$0\n</fx:Style>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Style>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Style> as child element of root (without < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(26, 4);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Style", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Style>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Style", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Style>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Style", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Style>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "<fx:Style>\n\t$0\n</fx:Style>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Style>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits <fx:Style> as child of non-root element (after < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(10, 9);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Style", vscode.CompletionItemKind.Keyword, items);
-						assert.equal(mxmlItem, null, "vscode.executeCompletionItemProvider failed to omit <fx:Style> in non-root element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits <fx:Style> as child of non-root element (without < bracket)", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(24, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Style", vscode.CompletionItemKind.Keyword, items);
-						assert.equal(mxmlItem, null, "vscode.executeCompletionItemProvider failed to omit <fx:Style> in non-root element: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes <fx:Style> as child element of root with existing prefix", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(20, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Style", vscode.CompletionItemKind.Keyword, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide <fx:Style>: " + uri);
-						assert.strictEqual(mxmlItem.sortText, "Style", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Style>: " + uri);
-						assert.strictEqual(mxmlItem.filterText, "Style", "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Style>: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "Style>\n\t$0\n</fx:Style>", "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Style>: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits <fx:Style> as child of non-root element with existing prefix", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(18, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("fx:Style", vscode.CompletionItemKind.Keyword, items);
-						assert.equal(mxmlItem, null, "vscode.executeCompletionItemProvider failed to omit <fx:Style> in non-root element existing prefix: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes state for property attribute", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(21, 25);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let stateItem = findCompletionItemOfKind("stateOne", vscode.CompletionItemKind.Field, items);
-						assert.notEqual(stateItem, null, "vscode.executeCompletionItemProvider failed to provide state for property attribute: " + uri);
-						assert.strictEqual(stateItem.kind, vscode.CompletionItemKind.Field, "vscode.executeCompletionItemProvider failed to provide correct kind of state: " + uri);
-						assert.strictEqual(stateItem.insertText, "stateOne", "vscode.executeCompletionItemProvider failed to provide correct insert text for state for property attribute: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes class in a package xmlns", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(22, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let classItem = findCompletionItemOfKind("MXMLPackageNS", vscode.CompletionItemKind.Class, items);
-						assert.notEqual(classItem, null, "vscode.executeCompletionItemProvider failed to provide class in a package xmlns: " + uri);
-						assert.strictEqual(classItem.kind, vscode.CompletionItemKind.Class, "vscode.executeCompletionItemProvider failed to provide correct kind of class: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes class with existing prefix", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(16, 8);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("View", vscode.CompletionItemKind.Class, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide class with existing prefix: " + uri);
-						assert.strictEqual(mxmlItem.kind, vscode.CompletionItemKind.Class, "vscode.executeCompletionItemProvider failed to provide correct kind of class: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes class with partial name and existing prefix", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(30, 11);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("View", vscode.CompletionItemKind.Class, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to include class with partial name and existing prefix: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes class with full name and existing prefix", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(9, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("View", vscode.CompletionItemKind.Class, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to include class with partial name and existing prefix: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits id as attribute of <fx:Declarations>", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(28, 21);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("id", items);
-						assert.equal(propertyItem, null, "vscode.executeCompletionItemProvider failed to omit keyword as attribute: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes id as attribute of <fx:Object>", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(29, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("id", items);
-						assert.notEqual(propertyItem, null, "vscode.executeCompletionItemProvider failed to include keyword as attribute: " + uri);
-						assert.strictEqual(propertyItem.kind, vscode.CompletionItemKind.Keyword, "vscode.executeCompletionItemProvider failed to provide correct kind of keyword as attribute: " + uri);
-						let snippet = propertyItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "id=\"$0\"", "vscode.executeCompletionItemProvider failed to provide correct insert text for keyword as attribute: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits includeIn as attribute of <fx:Declarations>", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(28, 21);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("includeIn", items);
-						assert.equal(propertyItem, null, "vscode.executeCompletionItemProvider failed to omit keyword as attribute: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes includeIn as attribute of <fx:Object>", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(29, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("includeIn", items);
-						assert.notEqual(propertyItem, null, "vscode.executeCompletionItemProvider failed to include keyword as attribute: " + uri);
-						assert.strictEqual(propertyItem.kind, vscode.CompletionItemKind.Keyword, "vscode.executeCompletionItemProvider failed to provide correct kind of keyword as attribute: " + uri);
-						let snippet = propertyItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "includeIn=\"$0\"", "vscode.executeCompletionItemProvider failed to provide correct insert text for keyword as attribute: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider omits excludeFrom as attribute of <fx:Declarations>", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(28, 21);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("excludeFrom", items);
-						assert.equal(propertyItem, null, "vscode.executeCompletionItemProvider failed to omit keyword as attribute: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider includes excludeFrom as attribute of <fx:Object>", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLCompletion.mxml"));
-		let position = new vscode.Position(29, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let propertyItem = findCompletionItem("excludeFrom", items);
-						assert.notEqual(propertyItem, null, "vscode.executeCompletionItemProvider failed to include keyword as attribute: " + uri);
-						assert.strictEqual(propertyItem.kind, vscode.CompletionItemKind.Keyword, "vscode.executeCompletionItemProvider failed to provide correct kind of keyword as attribute: " + uri);
-						let snippet = propertyItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "excludeFrom=\"$0\"", "vscode.executeCompletionItemProvider failed to provide correct insert text for keyword as attribute: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider works in an empty MXML file", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "mxmlCompletion", "MXMLCompletionEmpty.mxml"));
-		let position = new vscode.Position(0, 0);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("example:PackageClass", vscode.CompletionItemKind.Class, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide class: " + uri);
-						assert.strictEqual(mxmlItem.kind, vscode.CompletionItemKind.Class, "vscode.executeCompletionItemProvider failed to provide correct kind of class: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "<example:PackageClass xmlns:fx=\"http://ns.adobe.com/mxml/2009\"\n\txmlns:example=\"com.example.*\">\n\t$0\n</example:PackageClass>");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider works in an MXML file with only <", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "mxmlCompletion", "MXMLCompletionEmptyExceptBracket.mxml"));
-		let position = new vscode.Position(0, 1);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("example:PackageClass", vscode.CompletionItemKind.Class, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide class: " + uri);
-						assert.strictEqual(mxmlItem.kind, vscode.CompletionItemKind.Class, "vscode.executeCompletionItemProvider failed to provide correct kind of class: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "example:PackageClass xmlns:fx=\"http://ns.adobe.com/mxml/2009\"\n\txmlns:example=\"com.example.*\">\n\t$0\n</example:PackageClass>");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCompletionItemProvider works in an MXML file with partial root tag", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "mxmlCompletion", "MXMLCompletionPartialRootTag.mxml"));
-		let position = new vscode.Position(0, 12);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeCompletionItemProvider", uri, position)
-				.then((list: vscode.CompletionList) =>
-					{
-						let items = list.items;
-						let mxmlItem = findCompletionItemOfKind("example:PackageClass", vscode.CompletionItemKind.Class, items);
-						assert.notEqual(mxmlItem, null, "vscode.executeCompletionItemProvider failed to provide class: " + uri);
-						assert.strictEqual(mxmlItem.kind, vscode.CompletionItemKind.Class, "vscode.executeCompletionItemProvider failed to provide correct kind of class: " + uri);
-						let snippet = mxmlItem.insertText as vscode.SnippetString;
-						assert.strictEqual(snippet.value, "example:PackageClass xmlns:fx=\"http://ns.adobe.com/mxml/2009\"\n\txmlns:example=\"com.example.*\">\n\t$0\n</example:PackageClass>");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute completion item provider: " + uri);
-					});
-		});
-	});
+suite("MXML completion item provider: Application workspace", () => {
+  suiteTeardown(revertAndCloseAllEditors);
+  test("vscode.executeCompletionItemProvider includes property as attribute", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(9, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("className", items);
+            assert.notEqual(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide property as attribute: " +
+                uri
+            );
+            assert.strictEqual(
+              propertyItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of property: " +
+                uri
+            );
+            let snippet = propertyItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              'className="$0"',
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for property as attribute: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes property as child element (after < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(10, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("className", items);
+            assert.notEqual(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide property as child element: " +
+                uri
+            );
+            assert.strictEqual(
+              propertyItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of property: " +
+                uri
+            );
+            let snippet = propertyItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "js:className>$0</js:className>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for property as child element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes property as child element (without < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(24, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("className", items);
+            assert.notEqual(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide property as child element: " +
+                uri
+            );
+            assert.strictEqual(
+              propertyItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of property: " +
+                uri
+            );
+            let snippet = propertyItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "<js:className>$0</js:className>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for property as child element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes property as child element (after < bracket and existing prefix)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(14, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("className", items);
+            assert.notEqual(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide property as child element: " +
+                uri
+            );
+            assert.strictEqual(
+              propertyItem.kind,
+              vscode.CompletionItemKind.Property,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of property: " +
+                uri
+            );
+            let snippet = propertyItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "className>$0</js:className>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for property as child element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits property as attribute of closing element", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(11, 14);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("className", items);
+            assert.equal(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit property as attribute of closing element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes member variable as attribute", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(9, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("beads", items);
+            assert.notEqual(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide member variable as attribute: " +
+                uri
+            );
+            assert.strictEqual(
+              propertyItem.kind,
+              vscode.CompletionItemKind.Field,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of member variable: " +
+                uri
+            );
+            let snippet = propertyItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              'beads="$0"',
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for member variable as attribute: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes member variable as child element (after < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(10, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("beads", items);
+            assert.notEqual(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide member variable as child element: " +
+                uri
+            );
+            assert.strictEqual(
+              propertyItem.kind,
+              vscode.CompletionItemKind.Field,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of member variable: " +
+                uri
+            );
+            let snippet = propertyItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "js:beads>$0</js:beads>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for member variable as child element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes member variable as child element (without < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(24, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("beads", items);
+            assert.notEqual(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide member variable as child element: " +
+                uri
+            );
+            assert.strictEqual(
+              propertyItem.kind,
+              vscode.CompletionItemKind.Field,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of member variable: " +
+                uri
+            );
+            let snippet = propertyItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "<js:beads>$0</js:beads>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for member variable as child element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes member variable as child element (after < bracket and exiting prefix)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(14, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("beads", items);
+            assert.notEqual(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide member variable as child element: " +
+                uri
+            );
+            assert.strictEqual(
+              propertyItem.kind,
+              vscode.CompletionItemKind.Field,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of member variable: " +
+                uri
+            );
+            let snippet = propertyItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "beads>$0</js:beads>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for member variable as child element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits member variable as attribute of closing element", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(11, 14);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("beads", items);
+            assert.equal(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit member variable as attribute of closing element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes event as attribute", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(9, 13);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let eventItem = findCompletionItem("click", items);
+            assert.notEqual(
+              eventItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide event as attribute: " +
+                uri
+            );
+            assert.strictEqual(
+              eventItem.kind,
+              vscode.CompletionItemKind.Event,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of event: " +
+                uri
+            );
+            let snippet = eventItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              'click="$0"',
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for event as attribute: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes event as child element (after < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(10, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let eventItem = findCompletionItem("click", items);
+            assert.notEqual(
+              eventItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide event as child element: " +
+                uri
+            );
+            assert.strictEqual(
+              eventItem.kind,
+              vscode.CompletionItemKind.Event,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of event: " +
+                uri
+            );
+            let snippet = eventItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "js:click>$0</js:click>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for event as child element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes event as child element (without < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(24, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let eventItem = findCompletionItem("click", items);
+            assert.notEqual(
+              eventItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide event as child element: " +
+                uri
+            );
+            assert.strictEqual(
+              eventItem.kind,
+              vscode.CompletionItemKind.Event,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of event: " +
+                uri
+            );
+            let snippet = eventItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "<js:click>$0</js:click>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for event as child element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes event as child element (after < bracket and existing prefix)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(14, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let eventItem = findCompletionItem("click", items);
+            assert.notEqual(
+              eventItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide event as child element: " +
+                uri
+            );
+            assert.strictEqual(
+              eventItem.kind,
+              vscode.CompletionItemKind.Event,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of event: " +
+                uri
+            );
+            let snippet = eventItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "click>$0</js:click>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for event as child element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits event as attribute of closing element", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(11, 14);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let eventItem = findCompletionItem("click", items);
+            assert.equal(
+              eventItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit event as attribute of closing element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes class as child element (after < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(10, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let packageClassItem = findCompletionItem(
+              "example:UnreferencedClass",
+              items
+            );
+            assert.notEqual(
+              packageClassItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide package class: " +
+                uri
+            );
+            assert.strictEqual(
+              packageClassItem.kind,
+              vscode.CompletionItemKind.Class,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of package class: " +
+                uri
+            );
+            assert.strictEqual(
+              packageClassItem.sortText,
+              "UnreferencedClass",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for package class as child element: " +
+                uri
+            );
+            assert.strictEqual(
+              packageClassItem.filterText,
+              "UnreferencedClass",
+              "vscode.executeCompletionItemProvider failed to provide correct filter text for package class as child element: " +
+                uri
+            );
+            assert.strictEqual(
+              packageClassItem.insertText,
+              "example:UnreferencedClass",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for package class as child element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes class as child element (without < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(24, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let packageClassItem = findCompletionItem(
+              "example:UnreferencedClass",
+              items
+            );
+            assert.notEqual(
+              packageClassItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide package class: " +
+                uri
+            );
+            assert.strictEqual(
+              packageClassItem.kind,
+              vscode.CompletionItemKind.Class,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of package class: " +
+                uri
+            );
+            assert.strictEqual(
+              packageClassItem.sortText,
+              "UnreferencedClass",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for package class as child element: " +
+                uri
+            );
+            assert.strictEqual(
+              packageClassItem.filterText,
+              "UnreferencedClass",
+              "vscode.executeCompletionItemProvider failed to provide correct filter text for package class as child element: " +
+                uri
+            );
+            assert.strictEqual(
+              packageClassItem.insertText,
+              "<example:UnreferencedClass",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for package class as child element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Binding> as child element of root (after < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(12, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Binding",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Binding>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Binding",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Binding>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Binding",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Binding>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "fx:Binding>\n\t$0\n</fx:Binding>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Binding>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Binding> as child element of root (without < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(26, 4);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Binding",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Binding>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Binding",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Binding>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Binding",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Binding>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "<fx:Binding>\n\t$0\n</fx:Binding>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Binding>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits <fx:Binding> as child of non-root element (after < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(10, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Binding",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.equal(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit <fx:Binding> in non-root element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits <fx:Binding> as child of non-root element (without < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(24, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Binding",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.equal(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit <fx:Binding> in non-root element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Binding> as child element of root with existing prefix", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(20, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Binding",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Binding>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Binding",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Binding>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Binding",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Binding>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "Binding>\n\t$0\n</fx:Binding>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Binding>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits <fx:Binding> as child of non-root element with existing prefix", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(18, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Binding",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.equal(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit <fx:Binding> in non-root element existing prefix: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Component> as child element of root (after < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(12, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Component",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Component>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Component",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Component",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "fx:Component>\n\t$0\n</fx:Component>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Component>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Component> as child element of root (without < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(26, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Component",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Component>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Component",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Component",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "<fx:Component>\n\t$0\n</fx:Component>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Component>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Component> as child of non-root element (after < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(10, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Component",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Component>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Component",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Component",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "fx:Component>\n\t$0\n</fx:Component>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Component>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Component> as child of non-root element (without < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(24, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Component",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Component>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Component",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Component",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "<fx:Component>\n\t$0\n</fx:Component>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Component>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Component> as child element of root with existing prefix", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(20, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Component",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Component>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Component",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Component",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "Component>\n\t$0\n</fx:Component>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Component>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Component> as child of non-root element with existing prefix", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(18, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Component",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Component>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Component",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Component",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Component>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "Component>\n\t$0\n</fx:Component>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Component>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Declarations> as child element of root (after < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(12, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Declarations",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Declarations>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Declarations",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Declarations>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Declarations",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Declarations>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "fx:Declarations>\n\t$0\n</fx:Declarations>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Declarations>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Declarations> as child element of root (without < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(26, 4);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Declarations",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Declarations>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Declarations",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Declarations>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Declarations",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Declarations>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "<fx:Declarations>\n\t$0\n</fx:Declarations>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Declarations>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits <fx:Declarations> as child of non-root element (after < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(10, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Declarations",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.equal(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit <fx:Declarations> in non-root element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits <fx:Declarations> as child of non-root element (without < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(24, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Declarations",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.equal(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit <fx:Declarations> in non-root element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Declarations> as child element of root with existing prefix", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(20, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Declarations",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Declarations>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Declarations",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Declarations>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Declarations",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Declarations>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "Declarations>\n\t$0\n</fx:Declarations>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Declarations>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits <fx:Declarations> as child of non-root element with existing prefix", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(18, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Declarations",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.equal(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit <fx:Declarations> in non-root element existing prefix: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Metadata> as child element of root (after < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(12, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Metadata",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Metadata>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Metadata",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Metadata>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Metadata",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Metadata>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "fx:Metadata>\n\t$0\n</fx:Metadata>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Metadata>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Metadata> as child element of root (without < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(26, 4);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Metadata",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Metadata>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Metadata",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Metadata>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Metadata",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Metadata>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "<fx:Metadata>\n\t$0\n</fx:Metadata>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Metadata>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits <fx:Metadata> as child of non-root element (after < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(10, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Metadata",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.equal(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit <fx:Metadata> in non-root element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits <fx:Metadata> as child of non-root element (without < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(24, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Metadata",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.equal(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit <fx:Metadata> in non-root element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Metadata> as child element of root with existing prefix", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(20, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Metadata",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Metadata>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Metadata",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Metadata>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Metadata",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Metadata>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "Metadata>\n\t$0\n</fx:Metadata>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Metadata>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits <fx:Metadata> as child of non-root element with existing prefix", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(18, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Metadata",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.equal(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit <fx:Metadata> in non-root element existing prefix: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Script> as child element of root (after < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(12, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Script",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Script>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Script",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Script>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Script",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Script>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "fx:Script>\n\t<![CDATA[\n\t\t$0\n\t]]>\n</fx:Script>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Script>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Script> as child element of root (without < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(26, 4);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Script",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Script>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Script",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Script>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Script",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Script>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "<fx:Script>\n\t<![CDATA[\n\t\t$0\n\t]]>\n</fx:Script>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Script>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits <fx:Script> as child of non-root element (after < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(10, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Script",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.equal(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit <fx:Script> in non-root element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits <fx:Script> as child of non-root element (without < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(24, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Script",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.equal(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit <fx:Script> in non-root element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Script> as child element of root with existing prefix", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(20, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Script",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Script>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Script",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Script>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Script",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Script>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "Script>\n\t<![CDATA[\n\t\t$0\n\t]]>\n</fx:Script>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Script>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits <fx:Script> as child of non-root element with existing prefix", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(18, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Script",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.equal(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit <fx:Script> in non-root element existing prefix: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Style> as child element of root (after < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(12, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Style",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Style>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Style",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Style>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Style",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Style>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "fx:Style>\n\t$0\n</fx:Style>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Style>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Style> as child element of root (without < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(26, 4);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Style",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Style>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Style",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Style>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Style",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Style>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "<fx:Style>\n\t$0\n</fx:Style>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Style>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits <fx:Style> as child of non-root element (after < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(10, 9);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Style",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.equal(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit <fx:Style> in non-root element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits <fx:Style> as child of non-root element (without < bracket)", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(24, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Style",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.equal(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit <fx:Style> in non-root element: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes <fx:Style> as child element of root with existing prefix", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(20, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Style",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide <fx:Style>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.sortText,
+              "Style",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Style>: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.filterText,
+              "Style",
+              "vscode.executeCompletionItemProvider failed to provide correct sort text for <fx:Style>: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              "Style>\n\t$0\n</fx:Style>",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for <fx:Style>: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits <fx:Style> as child of non-root element with existing prefix", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(18, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "fx:Style",
+              vscode.CompletionItemKind.Keyword,
+              items
+            );
+            assert.equal(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit <fx:Style> in non-root element existing prefix: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes state for property attribute", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(21, 25);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let stateItem = findCompletionItemOfKind(
+              "stateOne",
+              vscode.CompletionItemKind.Field,
+              items
+            );
+            assert.notEqual(
+              stateItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide state for property attribute: " +
+                uri
+            );
+            assert.strictEqual(
+              stateItem.kind,
+              vscode.CompletionItemKind.Field,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of state: " +
+                uri
+            );
+            assert.strictEqual(
+              stateItem.insertText,
+              "stateOne",
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for state for property attribute: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes class in a package xmlns", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(22, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let classItem = findCompletionItemOfKind(
+              "MXMLPackageNS",
+              vscode.CompletionItemKind.Class,
+              items
+            );
+            assert.notEqual(
+              classItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide class in a package xmlns: " +
+                uri
+            );
+            assert.strictEqual(
+              classItem.kind,
+              vscode.CompletionItemKind.Class,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of class: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes class with existing prefix", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(16, 8);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "View",
+              vscode.CompletionItemKind.Class,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide class with existing prefix: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.kind,
+              vscode.CompletionItemKind.Class,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of class: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes class with partial name and existing prefix", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(30, 11);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "View",
+              vscode.CompletionItemKind.Class,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to include class with partial name and existing prefix: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes class with full name and existing prefix", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(9, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "View",
+              vscode.CompletionItemKind.Class,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to include class with partial name and existing prefix: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits id as attribute of <fx:Declarations>", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(28, 21);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("id", items);
+            assert.equal(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit keyword as attribute: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes id as attribute of <fx:Object>", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(29, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("id", items);
+            assert.notEqual(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to include keyword as attribute: " +
+                uri
+            );
+            assert.strictEqual(
+              propertyItem.kind,
+              vscode.CompletionItemKind.Keyword,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of keyword as attribute: " +
+                uri
+            );
+            let snippet = propertyItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              'id="$0"',
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for keyword as attribute: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits includeIn as attribute of <fx:Declarations>", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(28, 21);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("includeIn", items);
+            assert.equal(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit keyword as attribute: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes includeIn as attribute of <fx:Object>", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(29, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("includeIn", items);
+            assert.notEqual(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to include keyword as attribute: " +
+                uri
+            );
+            assert.strictEqual(
+              propertyItem.kind,
+              vscode.CompletionItemKind.Keyword,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of keyword as attribute: " +
+                uri
+            );
+            let snippet = propertyItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              'includeIn="$0"',
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for keyword as attribute: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider omits excludeFrom as attribute of <fx:Declarations>", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(28, 21);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("excludeFrom", items);
+            assert.equal(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to omit keyword as attribute: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider includes excludeFrom as attribute of <fx:Object>", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLCompletion.mxml"
+      )
+    );
+    let position = new vscode.Position(29, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let propertyItem = findCompletionItem("excludeFrom", items);
+            assert.notEqual(
+              propertyItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to include keyword as attribute: " +
+                uri
+            );
+            assert.strictEqual(
+              propertyItem.kind,
+              vscode.CompletionItemKind.Keyword,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of keyword as attribute: " +
+                uri
+            );
+            let snippet = propertyItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              'excludeFrom="$0"',
+              "vscode.executeCompletionItemProvider failed to provide correct insert text for keyword as attribute: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider works in an empty MXML file", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "mxmlCompletion",
+        "MXMLCompletionEmpty.mxml"
+      )
+    );
+    let position = new vscode.Position(0, 0);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "example:PackageClass",
+              vscode.CompletionItemKind.Class,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide class: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.kind,
+              vscode.CompletionItemKind.Class,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of class: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              '<example:PackageClass xmlns:fx="http://ns.adobe.com/mxml/2009"\n\txmlns:example="com.example.*">\n\t$0\n</example:PackageClass>'
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider works in an MXML file with only <", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "mxmlCompletion",
+        "MXMLCompletionEmptyExceptBracket.mxml"
+      )
+    );
+    let position = new vscode.Position(0, 1);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "example:PackageClass",
+              vscode.CompletionItemKind.Class,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide class: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.kind,
+              vscode.CompletionItemKind.Class,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of class: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              'example:PackageClass xmlns:fx="http://ns.adobe.com/mxml/2009"\n\txmlns:example="com.example.*">\n\t$0\n</example:PackageClass>'
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCompletionItemProvider works in an MXML file with partial root tag", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "mxmlCompletion",
+        "MXMLCompletionPartialRootTag.mxml"
+      )
+    );
+    let position = new vscode.Position(0, 12);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeCompletionItemProvider", uri, position)
+        .then(
+          (list: vscode.CompletionList) => {
+            let items = list.items;
+            let mxmlItem = findCompletionItemOfKind(
+              "example:PackageClass",
+              vscode.CompletionItemKind.Class,
+              items
+            );
+            assert.notEqual(
+              mxmlItem,
+              null,
+              "vscode.executeCompletionItemProvider failed to provide class: " +
+                uri
+            );
+            assert.strictEqual(
+              mxmlItem.kind,
+              vscode.CompletionItemKind.Class,
+              "vscode.executeCompletionItemProvider failed to provide correct kind of class: " +
+                uri
+            );
+            let snippet = mxmlItem.insertText as vscode.SnippetString;
+            assert.strictEqual(
+              snippet.value,
+              'example:PackageClass xmlns:fx="http://ns.adobe.com/mxml/2009"\n\txmlns:example="com.example.*">\n\t$0\n</example:PackageClass>'
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute completion item provider: " + uri);
+          }
+        );
+    });
+  });
 });
 
-suite("imports: Application workspace", () =>
-{
-	teardown(revertAndCloseActiveEditor);
-	test("as3mxml.addImport adds import for qualified class inside package block", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "addImport", "AddImport.as"));
-		let qualifiedName = "com.example.PackageClass";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand(COMMAND_ADD_IMPORT, qualifiedName, uri.toString(), 6, 9)
-				.then(() =>
-					{
-						return new Promise((resolve, reject) =>
-						{
-							//the text edit is not applied immediately, so give
-							//it a short delay before we check
-							setTimeout(() =>
-							{
-								let start = new vscode.Position(2, 0);
-								let end = new vscode.Position(4, 0);
-								let range = new vscode.Range(start, end);
-								let importText = editor.document.getText(range);
-								assert.strictEqual(importText, "\timport com.example.PackageClass;\n\n", "as3mxml.addImport failed to add import in file: " + uri);
-								resolve();
-							}, 250);
-						})
-					}, (err) =>
-					{
-						assert(false, "Failed to execute add import command: " + uri);
-					});
-		});
-	});
-	test("as3mxml.addImport adds import for qualified interface inside package block", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "addImport", "AddImport.as"));
-		let qualifiedName = "com.example.IPackageInterface";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand(COMMAND_ADD_IMPORT, qualifiedName, uri.toString(), 7, 26)
-				.then(() =>
-					{
-						return new Promise((resolve, reject) =>
-						{
-							//the text edit is not applied immediately, so give
-							//it a short delay before we check
-							setTimeout(() =>
-							{
-								let start = new vscode.Position(2, 0);
-								let end = new vscode.Position(4, 0);
-								let range = new vscode.Range(start, end);
-								let importText = editor.document.getText(range);
-								assert.strictEqual(importText, "\timport com.example.IPackageInterface;\n\n", "as3mxml.addImport failed to add import in file: " + uri);
-								resolve();
-							}, 250);
-						})
-					}, (err) =>
-					{
-						assert(false, "Failed to execute add import command: " + uri);
-					});
-		});
-	});
-	test("as3mxml.addImport adds import for qualified class after package block", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "addImport", "AddImport.as"));
-		let qualifiedName = "com.example.PackageClass";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand(COMMAND_ADD_IMPORT, qualifiedName, uri.toString(), 11, 25)
-				.then(() =>
-					{
-						return new Promise((resolve, reject) =>
-						{
-							//the text edit is not applied immediately, so give
-							//it a short delay before we check
-							setTimeout(() =>
-							{
-								let start = new vscode.Position(11, 0);
-								let end = new vscode.Position(13, 0);
-								let range = new vscode.Range(start, end);
-								let importText = editor.document.getText(range);
-								assert.strictEqual(importText, "import com.example.PackageClass;\n\n", "as3mxml.addImport failed to add import in file: " + uri);
-								resolve();
-							}, 250);
-						})
-					}, (err) =>
-					{
-						assert(false, "Failed to execute add import command: " + uri);
-					});
-		});
-	});
-	test("as3mxml.addImport adds import for qualified class inside MXML <fx:Script> tag", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "addImport", "MXMLAddImport.mxml"));
-		let qualifiedName = "com.example.PackageClass";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand(COMMAND_ADD_IMPORT, qualifiedName, uri.toString(), 7, 17)
-				.then(() =>
-					{
-						return new Promise((resolve, reject) =>
-						{
-							//the text edit is not applied immediately, so give
-							//it a short delay before we check
-							setTimeout(() =>
-							{
-								let start = new vscode.Position(5, 0);
-								let end = new vscode.Position(7, 0);
-								let range = new vscode.Range(start, end);
-								let importText = editor.document.getText(range);
-								assert.strictEqual(importText, "\t\t\timport com.example.PackageClass;\n\n", "as3mxml.addImport failed to add import in file: " + uri);
-								resolve();
-							}, 250);
-						})
-					}, (err) =>
-					{
-						assert(false, "Failed to execute add import command: " + uri);
-					});
-		});
-	});
-	test("as3mxml.addImport adds import for qualified class inside MXML event to an empty <fx:Script> tag", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "addImport", "MXMLAddImportFromEventEmptyScript.mxml"));
-		let qualifiedName = "com.example.PackageClass";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand(COMMAND_ADD_IMPORT, qualifiedName, uri.toString(), 3, 24)
-				.then(() =>
-					{
-						return new Promise((resolve, reject) =>
-						{
-							//the text edit is not applied immediately, so give
-							//it a short delay before we check
-							setTimeout(() =>
-							{
-								let start = new vscode.Position(6, 0);
-								let end = new vscode.Position(8, 0);
-								let range = new vscode.Range(start, end);
-								let importText = editor.document.getText(range);
-								assert.strictEqual(importText, "import com.example.PackageClass;\n\n", "as3mxml.addImport failed to add import in file: " + uri);
-								resolve();
-							}, 250);
-						})
-					}, (err) =>
-					{
-						assert(false, "Failed to execute add import command: " + uri);
-					});
-		});
-	});
-	test("as3mxml.addImport adds import for qualified class inside MXML event with no <fx:Script> tag", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "addImport", "MXMLAddImportFromEventNoScript.mxml"));
-		let qualifiedName = "com.example.PackageClass";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand(COMMAND_ADD_IMPORT, qualifiedName, uri.toString(), 3, 24)
-				.then(() =>
-					{
-						return new Promise((resolve, reject) =>
-						{
-							//the text edit is not applied immediately, so give
-							//it a short delay before we check
-							setTimeout(() =>
-							{
-								let start = new vscode.Position(4, 0);
-								let end = new vscode.Position(10, 0);
-								let range = new vscode.Range(start, end);
-								let importText = editor.document.getText(range);
-								assert.strictEqual(importText, "\t<fx:Script>\n\t\t<![CDATA[\n\t\t\timport com.example.PackageClass;\n\n\t\t]]>\n\t</fx:Script>\n", "as3mxml.addImport failed to add import in file: " + uri);
-								resolve();
-							}, 250);
-						})
-					}, (err) =>
-					{
-						assert(false, "Failed to execute add import command: " + uri);
-					});
-		});
-	});
-	test("as3mxml.addImport adds import for qualified class inside MXML event with no <mx:Script> tag", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "addImport", "MXMLAddImportNoScript2006.mxml"));
-		let qualifiedName = "com.example.PackageClass";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand(COMMAND_ADD_IMPORT, qualifiedName, uri.toString(), 3, 24)
-				.then(() =>
-					{
-						return new Promise((resolve, reject) =>
-						{
-							//the text edit is not applied immediately, so give
-							//it a short delay before we check
-							setTimeout(() =>
-							{
-								let start = new vscode.Position(4, 0);
-								let end = new vscode.Position(10, 0);
-								let range = new vscode.Range(start, end);
-								let importText = editor.document.getText(range);
-								assert.strictEqual(importText, "\t<mx:Script>\n\t\t<![CDATA[\n\t\t\timport com.example.PackageClass;\n\n\t\t]]>\n\t</mx:Script>\n", "as3mxml.addImport failed to add import in file: " + uri);
-								resolve();
-							}, 250);
-						})
-					}, (err) =>
-					{
-						assert(false, "Failed to execute add import command: " + uri);
-					});
-		});
-	});
+suite("imports: Application workspace", () => {
+  teardown(revertAndCloseActiveEditor);
+  test("as3mxml.addImport adds import for qualified class inside package block", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "addImport",
+        "AddImport.as"
+      )
+    );
+    let qualifiedName = "com.example.PackageClass";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(COMMAND_ADD_IMPORT, qualifiedName, uri.toString(), 6, 9)
+        .then(
+          () => {
+            return new Promise((resolve, reject) => {
+              //the text edit is not applied immediately, so give
+              //it a short delay before we check
+              setTimeout(() => {
+                let start = new vscode.Position(2, 0);
+                let end = new vscode.Position(4, 0);
+                let range = new vscode.Range(start, end);
+                let importText = editor.document.getText(range);
+                assert.strictEqual(
+                  importText,
+                  "\timport com.example.PackageClass;\n\n",
+                  "as3mxml.addImport failed to add import in file: " + uri
+                );
+                resolve();
+              }, 250);
+            });
+          },
+          (err) => {
+            assert(false, "Failed to execute add import command: " + uri);
+          }
+        );
+    });
+  });
+  test("as3mxml.addImport adds import for qualified interface inside package block", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "addImport",
+        "AddImport.as"
+      )
+    );
+    let qualifiedName = "com.example.IPackageInterface";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          COMMAND_ADD_IMPORT,
+          qualifiedName,
+          uri.toString(),
+          7,
+          26
+        )
+        .then(
+          () => {
+            return new Promise((resolve, reject) => {
+              //the text edit is not applied immediately, so give
+              //it a short delay before we check
+              setTimeout(() => {
+                let start = new vscode.Position(2, 0);
+                let end = new vscode.Position(4, 0);
+                let range = new vscode.Range(start, end);
+                let importText = editor.document.getText(range);
+                assert.strictEqual(
+                  importText,
+                  "\timport com.example.IPackageInterface;\n\n",
+                  "as3mxml.addImport failed to add import in file: " + uri
+                );
+                resolve();
+              }, 250);
+            });
+          },
+          (err) => {
+            assert(false, "Failed to execute add import command: " + uri);
+          }
+        );
+    });
+  });
+  test("as3mxml.addImport adds import for qualified class after package block", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "addImport",
+        "AddImport.as"
+      )
+    );
+    let qualifiedName = "com.example.PackageClass";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          COMMAND_ADD_IMPORT,
+          qualifiedName,
+          uri.toString(),
+          11,
+          25
+        )
+        .then(
+          () => {
+            return new Promise((resolve, reject) => {
+              //the text edit is not applied immediately, so give
+              //it a short delay before we check
+              setTimeout(() => {
+                let start = new vscode.Position(11, 0);
+                let end = new vscode.Position(13, 0);
+                let range = new vscode.Range(start, end);
+                let importText = editor.document.getText(range);
+                assert.strictEqual(
+                  importText,
+                  "import com.example.PackageClass;\n\n",
+                  "as3mxml.addImport failed to add import in file: " + uri
+                );
+                resolve();
+              }, 250);
+            });
+          },
+          (err) => {
+            assert(false, "Failed to execute add import command: " + uri);
+          }
+        );
+    });
+  });
+  test("as3mxml.addImport adds import for qualified class inside MXML <fx:Script> tag", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "addImport",
+        "MXMLAddImport.mxml"
+      )
+    );
+    let qualifiedName = "com.example.PackageClass";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          COMMAND_ADD_IMPORT,
+          qualifiedName,
+          uri.toString(),
+          7,
+          17
+        )
+        .then(
+          () => {
+            return new Promise((resolve, reject) => {
+              //the text edit is not applied immediately, so give
+              //it a short delay before we check
+              setTimeout(() => {
+                let start = new vscode.Position(5, 0);
+                let end = new vscode.Position(7, 0);
+                let range = new vscode.Range(start, end);
+                let importText = editor.document.getText(range);
+                assert.strictEqual(
+                  importText,
+                  "\t\t\timport com.example.PackageClass;\n\n",
+                  "as3mxml.addImport failed to add import in file: " + uri
+                );
+                resolve();
+              }, 250);
+            });
+          },
+          (err) => {
+            assert(false, "Failed to execute add import command: " + uri);
+          }
+        );
+    });
+  });
+  test("as3mxml.addImport adds import for qualified class inside MXML event to an empty <fx:Script> tag", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "addImport",
+        "MXMLAddImportFromEventEmptyScript.mxml"
+      )
+    );
+    let qualifiedName = "com.example.PackageClass";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          COMMAND_ADD_IMPORT,
+          qualifiedName,
+          uri.toString(),
+          3,
+          24
+        )
+        .then(
+          () => {
+            return new Promise((resolve, reject) => {
+              //the text edit is not applied immediately, so give
+              //it a short delay before we check
+              setTimeout(() => {
+                let start = new vscode.Position(6, 0);
+                let end = new vscode.Position(8, 0);
+                let range = new vscode.Range(start, end);
+                let importText = editor.document.getText(range);
+                assert.strictEqual(
+                  importText,
+                  "import com.example.PackageClass;\n\n",
+                  "as3mxml.addImport failed to add import in file: " + uri
+                );
+                resolve();
+              }, 250);
+            });
+          },
+          (err) => {
+            assert(false, "Failed to execute add import command: " + uri);
+          }
+        );
+    });
+  });
+  test("as3mxml.addImport adds import for qualified class inside MXML event with no <fx:Script> tag", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "addImport",
+        "MXMLAddImportFromEventNoScript.mxml"
+      )
+    );
+    let qualifiedName = "com.example.PackageClass";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          COMMAND_ADD_IMPORT,
+          qualifiedName,
+          uri.toString(),
+          3,
+          24
+        )
+        .then(
+          () => {
+            return new Promise((resolve, reject) => {
+              //the text edit is not applied immediately, so give
+              //it a short delay before we check
+              setTimeout(() => {
+                let start = new vscode.Position(4, 0);
+                let end = new vscode.Position(10, 0);
+                let range = new vscode.Range(start, end);
+                let importText = editor.document.getText(range);
+                assert.strictEqual(
+                  importText,
+                  "\t<fx:Script>\n\t\t<![CDATA[\n\t\t\timport com.example.PackageClass;\n\n\t\t]]>\n\t</fx:Script>\n",
+                  "as3mxml.addImport failed to add import in file: " + uri
+                );
+                resolve();
+              }, 250);
+            });
+          },
+          (err) => {
+            assert(false, "Failed to execute add import command: " + uri);
+          }
+        );
+    });
+  });
+  test("as3mxml.addImport adds import for qualified class inside MXML event with no <mx:Script> tag", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "addImport",
+        "MXMLAddImportNoScript2006.mxml"
+      )
+    );
+    let qualifiedName = "com.example.PackageClass";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          COMMAND_ADD_IMPORT,
+          qualifiedName,
+          uri.toString(),
+          3,
+          24
+        )
+        .then(
+          () => {
+            return new Promise((resolve, reject) => {
+              //the text edit is not applied immediately, so give
+              //it a short delay before we check
+              setTimeout(() => {
+                let start = new vscode.Position(4, 0);
+                let end = new vscode.Position(10, 0);
+                let range = new vscode.Range(start, end);
+                let importText = editor.document.getText(range);
+                assert.strictEqual(
+                  importText,
+                  "\t<mx:Script>\n\t\t<![CDATA[\n\t\t\timport com.example.PackageClass;\n\n\t\t]]>\n\t</mx:Script>\n",
+                  "as3mxml.addImport failed to add import in file: " + uri
+                );
+                resolve();
+              }, 250);
+            });
+          },
+          (err) => {
+            assert(false, "Failed to execute add import command: " + uri);
+          }
+        );
+    });
+  });
 });
 
-suite("mxml namespaces: Application workspace", () =>
-{
-	teardown(revertAndCloseActiveEditor);
-	test("as3mxml.addMXMLNamespace adds new namespace", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLNamespace.mxml"));
-		let nsPrefix = "mx";
-		let nsUri = "library://ns.adobe.com/flex/mx";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand(COMMAND_ADD_MXML_NAMESPACE, nsPrefix, nsUri, uri.toString(), 48, 140)
-				.then(() =>
-					{
-						return new Promise((resolve, reject) =>
-						{
-							//the text edit is not applied immediately, so give
-							//it a short delay before we check
-							setTimeout(() =>
-							{
-								let start = new vscode.Position(2, 51);
-								let end = new vscode.Position(2, 93);
-								let range = new vscode.Range(start, end);
-								let importText = editor.document.getText(range);
-								assert.strictEqual(importText, " xmlns:mx=\"library://ns.adobe.com/flex/mx\"", "as3mxml.addMXMLNamespace failed to add MXML namspace in file: " + uri);
-								resolve();
-							}, 250);
-						})
-					}, (err) =>
-					{
-						assert(false, "Failed to execute add import command: " + uri);
-					});
-		});
-	});
+suite("mxml namespaces: Application workspace", () => {
+  teardown(revertAndCloseActiveEditor);
+  test("as3mxml.addMXMLNamespace adds new namespace", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLNamespace.mxml"
+      )
+    );
+    let nsPrefix = "mx";
+    let nsUri = "library://ns.adobe.com/flex/mx";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          COMMAND_ADD_MXML_NAMESPACE,
+          nsPrefix,
+          nsUri,
+          uri.toString(),
+          48,
+          140
+        )
+        .then(
+          () => {
+            return new Promise((resolve, reject) => {
+              //the text edit is not applied immediately, so give
+              //it a short delay before we check
+              setTimeout(() => {
+                let start = new vscode.Position(2, 51);
+                let end = new vscode.Position(2, 93);
+                let range = new vscode.Range(start, end);
+                let importText = editor.document.getText(range);
+                assert.strictEqual(
+                  importText,
+                  ' xmlns:mx="library://ns.adobe.com/flex/mx"',
+                  "as3mxml.addMXMLNamespace failed to add MXML namspace in file: " +
+                    uri
+                );
+                resolve();
+              }, 250);
+            });
+          },
+          (err) => {
+            assert(false, "Failed to execute add import command: " + uri);
+          }
+        );
+    });
+  });
 });
 
-suite("code action provider: imports : Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeCodeActionProvider finds import for base class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(2, 45);
-			let end = new vscode.Position(2, 45);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.CodeActionsBase";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\timport " + typeToImport + ";\n\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.notEqual(range, null, "Code action range invalid");
-						assert.strictEqual(range.start.line, 2, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 2, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for base class for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(19, 50);
-			let end = new vscode.Position(29, 50);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.CodeActionsBase";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "import " + typeToImport + ";\n\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.notEqual(range, null, "Code action range invalid");
-						assert.strictEqual(range.start.line, 19, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 19, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for implemented interface", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(2, 75);
-			let end = new vscode.Position(2, 75);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.ICodeActionsInterface";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\timport " + typeToImport + ";\n\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.notEqual(range, null, "Code action range invalid");
-						assert.strictEqual(range.start.line, 2, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 2, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for implemented interface in file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(19, 78);
-			let end = new vscode.Position(19, 78);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.ICodeActionsInterface";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "import " + typeToImport + ";\n\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.notEqual(range, null, "Code action range invalid");
-						assert.strictEqual(range.start.line, 19, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 19, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for new instance", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(7, 42);
-			let end = new vscode.Position(7, 42);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.CodeActionsNew";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\timport " + typeToImport + ";\n\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.notEqual(range, null, "Code action range invalid");
-						assert.strictEqual(range.start.line, 2, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 2, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for new instance in file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(24, 40);
-			let end = new vscode.Position(24, 40);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.CodeActionsNew";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "import " + typeToImport + ";\n\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.notEqual(range, null, "Code action range invalid");
-						assert.strictEqual(range.start.line, 19, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 19, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for variable type", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(6, 22);
-			let end = new vscode.Position(6, 22);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.CodeActionsVarType";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\timport " + typeToImport + ";\n\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.notEqual(range, null, "Code action range invalid");
-						assert.strictEqual(range.start.line, 2, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 2, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for variable type in file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(23, 20);
-			let end = new vscode.Position(23, 20);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.CodeActionsVarType";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "import " + typeToImport + ";\n\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.notEqual(range, null, "Code action range invalid");
-						assert.strictEqual(range.start.line, 19, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 19, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for parameter type", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(12, 46);
-			let end = new vscode.Position(12, 46);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.CodeActionsParamType";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\timport " + typeToImport + ";\n\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.notEqual(range, null, "Code action range invalid");
-						assert.strictEqual(range.start.line, 2, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 2, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for parameter type in file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(29, 46);
-			let end = new vscode.Position(29, 46);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.CodeActionsParamType";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "import " + typeToImport + ";\n\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.notEqual(range, null, "Code action range invalid");
-						assert.strictEqual(range.start.line, 19, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 19, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for return type", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(12, 70);
-			let end = new vscode.Position(12, 70);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.CodeActionsReturnType";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\timport " + typeToImport + ";\n\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.notEqual(range, null, "Code action range invalid");
-						assert.strictEqual(range.start.line, 2, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 2, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for return type in file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(29, 68);
-			let end = new vscode.Position(29, 68);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.CodeActionsReturnType";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "import " + typeToImport + ";\n\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.notEqual(range, null, "Code action range invalid");
-						assert.strictEqual(range.start.line, 19, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 19, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for type in assignment", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(8, 33);
-			let end = new vscode.Position(8, 33);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.CodeActionsAssign";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\timport " + typeToImport + ";\n\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.notEqual(range, null, "Code action range invalid");
-						assert.strictEqual(range.start.line, 2, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 2, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for type in assignment in file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(25, 32);
-			let end = new vscode.Position(25, 32);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.CodeActionsAssign";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "import " + typeToImport + ";\n\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.notEqual(range, null, "Code action range invalid");
-						assert.strictEqual(range.start.line, 19, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 19, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for multiple types with the same base name", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(9, 8);
-			let end = new vscode.Position(9, 8);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport1 = "com.example.codeActions.CodeActionsMultiple";
-						let codeAction1 = findImportCodeActionForType(typeToImport1, codeActions);
-						assert.notEqual(codeAction1, null, "Code action 1 not found");
-						assert.strictEqual(codeAction1.title, "Import " + typeToImport1, "Code action 1 provided incorrect title");
-						assert.strictEqual(codeAction1.command, undefined, "Code action 1 provided incorrect command");
-						assert.strictEqual(codeAction1.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action 1 provided incorrect kind");
-						let workspaceEdit1 = codeAction1.edit;
-						assert.notEqual(workspaceEdit1, undefined, "Code action 1 missing workspace edit");
-						assert.ok(workspaceEdit1.has(uri), "Code action 1 workspace edit missing URI: " + uri);
-						let textEdits1 = workspaceEdit1.get(uri);
-						assert.strictEqual(textEdits1.length, 1);
-						let textEdit1 = textEdits1[0];
-						assert.strictEqual(textEdit1.newText, "\timport " + typeToImport1 + ";\n\n", "Code action 1 workspace edit provided incorrect new text");
-						let range1 = textEdit1.range;
-						assert.notEqual(range1, null, "Code action 1 range invalid");
-						assert.strictEqual(range1.start.line, 2, "Code action 1 workspace edit provided incorrect start line");
-						assert.strictEqual(range1.start.character, 0, "Code action 1 workspace edit provided incorrect start character");
-						assert.strictEqual(range1.end.line, 2, "Code action 1 workspace edit provided incorrect end line");
-						assert.strictEqual(range1.end.character, 0, "Code action 1 workspace edit provided incorrect end character");
+suite("code action provider: imports : Application workspace", () => {
+  suiteTeardown(revertAndCloseAllEditors);
+  test("vscode.executeCodeActionProvider finds import for base class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(2, 45);
+      let end = new vscode.Position(2, 45);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.CodeActionsBase";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "\timport " + typeToImport + ";\n\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.notEqual(range, null, "Code action range invalid");
+            assert.strictEqual(
+              range.start.line,
+              2,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              2,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for base class for file-internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(19, 50);
+      let end = new vscode.Position(29, 50);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.CodeActionsBase";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "import " + typeToImport + ";\n\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.notEqual(range, null, "Code action range invalid");
+            assert.strictEqual(
+              range.start.line,
+              19,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              19,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for implemented interface", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(2, 75);
+      let end = new vscode.Position(2, 75);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.ICodeActionsInterface";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "\timport " + typeToImport + ";\n\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.notEqual(range, null, "Code action range invalid");
+            assert.strictEqual(
+              range.start.line,
+              2,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              2,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for implemented interface in file-internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(19, 78);
+      let end = new vscode.Position(19, 78);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.ICodeActionsInterface";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "import " + typeToImport + ";\n\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.notEqual(range, null, "Code action range invalid");
+            assert.strictEqual(
+              range.start.line,
+              19,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              19,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for new instance", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(7, 42);
+      let end = new vscode.Position(7, 42);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.CodeActionsNew";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "\timport " + typeToImport + ";\n\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.notEqual(range, null, "Code action range invalid");
+            assert.strictEqual(
+              range.start.line,
+              2,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              2,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for new instance in file-internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(24, 40);
+      let end = new vscode.Position(24, 40);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.CodeActionsNew";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "import " + typeToImport + ";\n\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.notEqual(range, null, "Code action range invalid");
+            assert.strictEqual(
+              range.start.line,
+              19,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              19,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for variable type", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(6, 22);
+      let end = new vscode.Position(6, 22);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.CodeActionsVarType";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "\timport " + typeToImport + ";\n\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.notEqual(range, null, "Code action range invalid");
+            assert.strictEqual(
+              range.start.line,
+              2,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              2,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for variable type in file-internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(23, 20);
+      let end = new vscode.Position(23, 20);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.CodeActionsVarType";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "import " + typeToImport + ";\n\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.notEqual(range, null, "Code action range invalid");
+            assert.strictEqual(
+              range.start.line,
+              19,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              19,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for parameter type", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(12, 46);
+      let end = new vscode.Position(12, 46);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.CodeActionsParamType";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "\timport " + typeToImport + ";\n\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.notEqual(range, null, "Code action range invalid");
+            assert.strictEqual(
+              range.start.line,
+              2,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              2,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for parameter type in file-internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(29, 46);
+      let end = new vscode.Position(29, 46);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.CodeActionsParamType";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "import " + typeToImport + ";\n\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.notEqual(range, null, "Code action range invalid");
+            assert.strictEqual(
+              range.start.line,
+              19,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              19,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for return type", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(12, 70);
+      let end = new vscode.Position(12, 70);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.CodeActionsReturnType";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "\timport " + typeToImport + ";\n\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.notEqual(range, null, "Code action range invalid");
+            assert.strictEqual(
+              range.start.line,
+              2,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              2,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for return type in file-internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(29, 68);
+      let end = new vscode.Position(29, 68);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.CodeActionsReturnType";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "import " + typeToImport + ";\n\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.notEqual(range, null, "Code action range invalid");
+            assert.strictEqual(
+              range.start.line,
+              19,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              19,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for type in assignment", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(8, 33);
+      let end = new vscode.Position(8, 33);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.CodeActionsAssign";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "\timport " + typeToImport + ";\n\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.notEqual(range, null, "Code action range invalid");
+            assert.strictEqual(
+              range.start.line,
+              2,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              2,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for type in assignment in file-internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(25, 32);
+      let end = new vscode.Position(25, 32);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.CodeActionsAssign";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "import " + typeToImport + ";\n\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.notEqual(range, null, "Code action range invalid");
+            assert.strictEqual(
+              range.start.line,
+              19,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              19,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for multiple types with the same base name", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(9, 8);
+      let end = new vscode.Position(9, 8);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport1 = "com.example.codeActions.CodeActionsMultiple";
+            let codeAction1 = findImportCodeActionForType(
+              typeToImport1,
+              codeActions
+            );
+            assert.notEqual(codeAction1, null, "Code action 1 not found");
+            assert.strictEqual(
+              codeAction1.title,
+              "Import " + typeToImport1,
+              "Code action 1 provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction1.command,
+              undefined,
+              "Code action 1 provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction1.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action 1 provided incorrect kind"
+            );
+            let workspaceEdit1 = codeAction1.edit;
+            assert.notEqual(
+              workspaceEdit1,
+              undefined,
+              "Code action 1 missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit1.has(uri),
+              "Code action 1 workspace edit missing URI: " + uri
+            );
+            let textEdits1 = workspaceEdit1.get(uri);
+            assert.strictEqual(textEdits1.length, 1);
+            let textEdit1 = textEdits1[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              "\timport " + typeToImport1 + ";\n\n",
+              "Code action 1 workspace edit provided incorrect new text"
+            );
+            let range1 = textEdit1.range;
+            assert.notEqual(range1, null, "Code action 1 range invalid");
+            assert.strictEqual(
+              range1.start.line,
+              2,
+              "Code action 1 workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range1.start.character,
+              0,
+              "Code action 1 workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range1.end.line,
+              2,
+              "Code action 1 workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range1.end.character,
+              0,
+              "Code action 1 workspace edit provided incorrect end character"
+            );
 
-						let typeToImport2 = "com.example.codeActions.more.CodeActionsMultiple";
-						let codeAction2 = findImportCodeActionForType(typeToImport2, codeActions);
-						assert.notEqual(codeAction2, null, "Code action 2 not found");
-						assert.strictEqual(codeAction2.title, "Import " + typeToImport2, "Code action 2 provided incorrect title");
-						assert.strictEqual(codeAction2.command, undefined, "Code action 2 provided incorrect command");
-						assert.strictEqual(codeAction2.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action 2 provided incorrect kind");
-						let workspaceEdit2 = codeAction2.edit;
-						assert.notEqual(workspaceEdit2, undefined, "Code action 2 missing workspace edit");
-						assert.ok(workspaceEdit2.has(uri), "Code action 2 workspace edit missing URI: " + uri);
-						let textEdits2 = workspaceEdit2.get(uri);
-						assert.strictEqual(textEdits2.length, 1);
-						let textEdit2 = textEdits2[0];
-						assert.strictEqual(textEdit2.newText, "\timport " + typeToImport2 + ";\n\n", "Code action 2 workspace edit provided incorrect new text");
-						let range2 = textEdit2.range;
-						assert.notEqual(range2, null, "Code action 2 range invalid");
-						assert.strictEqual(range2.start.line, 2, "Code action 2 workspace edit provided incorrect start line");
-						assert.strictEqual(range2.start.character, 0, "Code action 2 workspace edit provided incorrect start character");
-						assert.strictEqual(range2.end.line, 2, "Code action 2 workspace edit provided incorrect end line");
-						assert.strictEqual(range2.end.character, 0, "Code action 2 workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for multiple types with the same base name in file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(26, 6);
-			let end = new vscode.Position(26, 6);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport1 = "com.example.codeActions.CodeActionsMultiple";
-						let codeAction1 = findImportCodeActionForType(typeToImport1, codeActions);
-						assert.notEqual(codeAction1, null, "Code action 1 not found");
-						assert.strictEqual(codeAction1.title, "Import " + typeToImport1, "Code action 1 provided incorrect title");
-						assert.strictEqual(codeAction1.command, undefined, "Code action 1 provided incorrect command");
-						assert.strictEqual(codeAction1.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action 1 provided incorrect kind");
-						let workspaceEdit1 = codeAction1.edit;
-						assert.notEqual(workspaceEdit1, undefined, "Code action 1 missing workspace edit");
-						assert.ok(workspaceEdit1.has(uri), "Code action 1 workspace edit missing URI: " + uri);
-						let textEdits1 = workspaceEdit1.get(uri);
-						assert.strictEqual(textEdits1.length, 1);
-						let textEdit1 = textEdits1[0];
-						assert.strictEqual(textEdit1.newText, "import " + typeToImport1 + ";\n\n", "Code action 1 workspace edit provided incorrect new text");
-						let range1 = textEdit1.range;
-						assert.notEqual(range1, null, "Code action 1 range invalid");
-						assert.strictEqual(range1.start.line, 19, "Code action 1 workspace edit provided incorrect start line");
-						assert.strictEqual(range1.start.character, 0, "Code action 1 workspace edit provided incorrect start character");
-						assert.strictEqual(range1.end.line, 19, "Code action 1 workspace edit provided incorrect end line");
-						assert.strictEqual(range1.end.character, 0, "Code action 1 workspace edit provided incorrect end character");
+            let typeToImport2 =
+              "com.example.codeActions.more.CodeActionsMultiple";
+            let codeAction2 = findImportCodeActionForType(
+              typeToImport2,
+              codeActions
+            );
+            assert.notEqual(codeAction2, null, "Code action 2 not found");
+            assert.strictEqual(
+              codeAction2.title,
+              "Import " + typeToImport2,
+              "Code action 2 provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction2.command,
+              undefined,
+              "Code action 2 provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction2.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action 2 provided incorrect kind"
+            );
+            let workspaceEdit2 = codeAction2.edit;
+            assert.notEqual(
+              workspaceEdit2,
+              undefined,
+              "Code action 2 missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit2.has(uri),
+              "Code action 2 workspace edit missing URI: " + uri
+            );
+            let textEdits2 = workspaceEdit2.get(uri);
+            assert.strictEqual(textEdits2.length, 1);
+            let textEdit2 = textEdits2[0];
+            assert.strictEqual(
+              textEdit2.newText,
+              "\timport " + typeToImport2 + ";\n\n",
+              "Code action 2 workspace edit provided incorrect new text"
+            );
+            let range2 = textEdit2.range;
+            assert.notEqual(range2, null, "Code action 2 range invalid");
+            assert.strictEqual(
+              range2.start.line,
+              2,
+              "Code action 2 workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range2.start.character,
+              0,
+              "Code action 2 workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range2.end.line,
+              2,
+              "Code action 2 workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range2.end.character,
+              0,
+              "Code action 2 workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for multiple types with the same base name in file-internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(26, 6);
+      let end = new vscode.Position(26, 6);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport1 = "com.example.codeActions.CodeActionsMultiple";
+            let codeAction1 = findImportCodeActionForType(
+              typeToImport1,
+              codeActions
+            );
+            assert.notEqual(codeAction1, null, "Code action 1 not found");
+            assert.strictEqual(
+              codeAction1.title,
+              "Import " + typeToImport1,
+              "Code action 1 provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction1.command,
+              undefined,
+              "Code action 1 provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction1.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action 1 provided incorrect kind"
+            );
+            let workspaceEdit1 = codeAction1.edit;
+            assert.notEqual(
+              workspaceEdit1,
+              undefined,
+              "Code action 1 missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit1.has(uri),
+              "Code action 1 workspace edit missing URI: " + uri
+            );
+            let textEdits1 = workspaceEdit1.get(uri);
+            assert.strictEqual(textEdits1.length, 1);
+            let textEdit1 = textEdits1[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              "import " + typeToImport1 + ";\n\n",
+              "Code action 1 workspace edit provided incorrect new text"
+            );
+            let range1 = textEdit1.range;
+            assert.notEqual(range1, null, "Code action 1 range invalid");
+            assert.strictEqual(
+              range1.start.line,
+              19,
+              "Code action 1 workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range1.start.character,
+              0,
+              "Code action 1 workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range1.end.line,
+              19,
+              "Code action 1 workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range1.end.character,
+              0,
+              "Code action 1 workspace edit provided incorrect end character"
+            );
 
-						let typeToImport2 = "com.example.codeActions.more.CodeActionsMultiple";
-						let codeAction2 = findImportCodeActionForType(typeToImport2, codeActions);
-						assert.notEqual(codeAction2, null, "Code action 2 not found");
-						assert.strictEqual(codeAction2.title, "Import " + typeToImport2, "Code action 2 provided incorrect title");
-						assert.strictEqual(codeAction2.command, undefined, "Code action 2 provided incorrect command");
-						assert.strictEqual(codeAction2.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action 2 provided incorrect kind");
-						let workspaceEdit2 = codeAction2.edit;
-						assert.notEqual(workspaceEdit2, undefined, "Code action 2 missing workspace edit");
-						assert.ok(workspaceEdit2.has(uri), "Code action 2 workspace edit missing URI: " + uri);
-						let textEdits2 = workspaceEdit2.get(uri);
-						assert.strictEqual(textEdits2.length, 1);
-						let textEdit2 = textEdits2[0];
-						assert.strictEqual(textEdit2.newText, "import " + typeToImport2 + ";\n\n", "Code action 2 workspace edit provided incorrect new text");
-						let range2 = textEdit2.range;
-						assert.notEqual(range2, null, "Code action 2 range invalid");
-						assert.strictEqual(range2.start.line, 19, "Code action 2 workspace edit provided incorrect start line");
-						assert.strictEqual(range2.start.character, 0, "Code 2 action workspace edit provided incorrect start character");
-						assert.strictEqual(range2.end.line, 19, "Code action 2 workspace edit provided incorrect end line");
-						assert.strictEqual(range2.end.character, 0, "Code action 2 workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider adds new import after existing imports", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsExistingImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(8, 22);
-			let end = new vscode.Position(8, 22);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.CodeActionsVarType";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\timport " + typeToImport + ";\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.notEqual(range, null, "Code action range invalid");
-						assert.strictEqual(range.start.line, 3, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 3, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider adds new import after existing imports for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsExistingImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(18, 22);
-			let end = new vscode.Position(18, 22);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.CodeActionsVarType";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "import " + typeToImport + ";\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.notEqual(range, null, "Code action range invalid");
-						assert.strictEqual(range.start.line, 13, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 13, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for type in MXML script", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsMXMLImports.mxml"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(7, 0);
-			let end = new vscode.Position(7, 38);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.CodeActionsVarType";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 5, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 5, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-						assert.strictEqual(textEdit.newText, "\t\t\timport " + typeToImport + ";\n\n", "Code action workspace edit provided incorrect new text");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds import for type in MXML event", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsMXMLImports.mxml"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(11, 0);
-			let end = new vscode.Position(11, 42);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let typeToImport = "com.example.codeActions.CodeActionsNew";
-						let codeAction = findImportCodeActionForType(typeToImport, codeActions);
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Import " + typeToImport, "Code action provided incorrect title");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 5, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 5, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-						assert.strictEqual(textEdit.newText, "\t\t\timport " + typeToImport + ";\n\n", "Code action workspace edit provided incorrect new text");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
+            let typeToImport2 =
+              "com.example.codeActions.more.CodeActionsMultiple";
+            let codeAction2 = findImportCodeActionForType(
+              typeToImport2,
+              codeActions
+            );
+            assert.notEqual(codeAction2, null, "Code action 2 not found");
+            assert.strictEqual(
+              codeAction2.title,
+              "Import " + typeToImport2,
+              "Code action 2 provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction2.command,
+              undefined,
+              "Code action 2 provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction2.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action 2 provided incorrect kind"
+            );
+            let workspaceEdit2 = codeAction2.edit;
+            assert.notEqual(
+              workspaceEdit2,
+              undefined,
+              "Code action 2 missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit2.has(uri),
+              "Code action 2 workspace edit missing URI: " + uri
+            );
+            let textEdits2 = workspaceEdit2.get(uri);
+            assert.strictEqual(textEdits2.length, 1);
+            let textEdit2 = textEdits2[0];
+            assert.strictEqual(
+              textEdit2.newText,
+              "import " + typeToImport2 + ";\n\n",
+              "Code action 2 workspace edit provided incorrect new text"
+            );
+            let range2 = textEdit2.range;
+            assert.notEqual(range2, null, "Code action 2 range invalid");
+            assert.strictEqual(
+              range2.start.line,
+              19,
+              "Code action 2 workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range2.start.character,
+              0,
+              "Code 2 action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range2.end.line,
+              19,
+              "Code action 2 workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range2.end.character,
+              0,
+              "Code action 2 workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider adds new import after existing imports", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsExistingImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(8, 22);
+      let end = new vscode.Position(8, 22);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.CodeActionsVarType";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "\timport " + typeToImport + ";\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.notEqual(range, null, "Code action range invalid");
+            assert.strictEqual(
+              range.start.line,
+              3,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              3,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider adds new import after existing imports for file-internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsExistingImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(18, 22);
+      let end = new vscode.Position(18, 22);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.CodeActionsVarType";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "import " + typeToImport + ";\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.notEqual(range, null, "Code action range invalid");
+            assert.strictEqual(
+              range.start.line,
+              13,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              13,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for type in MXML script", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsMXMLImports.mxml"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(7, 0);
+      let end = new vscode.Position(7, 38);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.CodeActionsVarType";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            let range = textEdit.range;
+            assert.strictEqual(
+              range.start.line,
+              5,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              5,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+            assert.strictEqual(
+              textEdit.newText,
+              "\t\t\timport " + typeToImport + ";\n\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider finds import for type in MXML event", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsMXMLImports.mxml"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(11, 0);
+      let end = new vscode.Position(11, 42);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let typeToImport = "com.example.codeActions.CodeActionsNew";
+            let codeAction = findImportCodeActionForType(
+              typeToImport,
+              codeActions
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Import " + typeToImport,
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            let range = textEdit.range;
+            assert.strictEqual(
+              range.start.line,
+              5,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              5,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+            assert.strictEqual(
+              textEdit.newText,
+              "\t\t\timport " + typeToImport + ";\n\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
 });
 
-suite("code action provider: generate local variable : Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeCodeActionProvider can generate local variable without this member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateVariable.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(6, 4);
-			let end = new vscode.Position(6, 4);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Local Variable";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\t\t\tvar myVar:Object;\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 6, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 6, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
+suite(
+  "code action provider: generate local variable : Application workspace",
+  () => {
+    suiteTeardown(revertAndCloseAllEditors);
+    test("vscode.executeCodeActionProvider can generate local variable without this member access", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateVariable.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(6, 4);
+        let end = new vscode.Position(6, 4);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Local Variable";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.QuickFix.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "\t\t\tvar myVar:Object;\n",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                6,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                0,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                6,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                0,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate local variable without this member access for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateVariable.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(16, 4);
+        let end = new vscode.Position(16, 4);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Local Variable";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.QuickFix.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "\t\tvar myVar:Object;\n",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                16,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                0,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                16,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                0,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider must not generate local variable with this member access", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateVariable.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(7, 10);
+        let end = new vscode.Position(7, 10);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Local Variable";
+              });
+              assert.strictEqual(
+                codeAction,
+                undefined,
+                "Code action incorrectly found"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider must not generate local variable with this member access for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateVariable.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(17, 10);
+        let end = new vscode.Position(17, 10);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Local Variable";
+              });
+              assert.strictEqual(
+                codeAction,
+                undefined,
+                "Code action incorrectly found"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+  }
+);
 
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate local variable without this member access for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateVariable.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(16, 4);
-			let end = new vscode.Position(16, 4);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Local Variable";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\t\tvar myVar:Object;\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 16, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 16, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
+suite(
+  "code action provider: generate field variable : Application workspace",
+  () => {
+    suiteTeardown(revertAndCloseAllEditors);
+    test("vscode.executeCodeActionProvider can generate field variable without this member access", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateVariable.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(6, 4);
+        let end = new vscode.Position(6, 4);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Field Variable";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.QuickFix.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "\n\t\tpublic var myVar:Object;\n",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                9,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                0,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                9,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                0,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate field variable without this member access for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateVariable.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(16, 4);
+        let end = new vscode.Position(16, 4);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Field Variable";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.QuickFix.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "\n\tpublic var myVar:Object;\n",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                19,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                0,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                19,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                0,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate field variable with this member access", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateVariable.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(7, 10);
+        let end = new vscode.Position(7, 10);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Field Variable";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.QuickFix.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "\n\t\tpublic var myVar:Object;\n",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                9,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                0,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                9,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                0,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate field variable with this member access for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateVariable.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(17, 10);
+        let end = new vscode.Position(17, 10);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Field Variable";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.QuickFix.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "\n\tpublic var myVar:Object;\n",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                19,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                0,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                19,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                0,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+  }
+);
 
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider must not generate local variable with this member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateVariable.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(7, 10);
-			let end = new vscode.Position(7, 10);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Local Variable";
-						});
-						assert.strictEqual(codeAction, undefined, "Code action incorrectly found");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider must not generate local variable with this member access for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateVariable.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(17, 10);
-			let end = new vscode.Position(17, 10);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Local Variable";
-						});
-						assert.strictEqual(codeAction, undefined, "Code action incorrectly found");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
+suite("code action provider: generate method : Application workspace", () => {
+  suiteTeardown(revertAndCloseAllEditors);
+  test("vscode.executeCodeActionProvider can generate member method without parameters without this member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "GenerateMethod.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(6, 6);
+      let end = new vscode.Position(6, 6);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let codeAction = codeActions.find((codeAction) => {
+              return codeAction.title == "Generate Method";
+            });
+            assert.notEqual(codeAction, undefined, "Code action not found");
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "\n\t\tprivate function myMethod():void\n\t\t{\n\t\t}\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.strictEqual(
+              range.start.line,
+              11,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              11,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider can generate member method without parameters without this member access for file-internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "GenerateMethod.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(18, 4);
+      let end = new vscode.Position(18, 4);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let codeAction = codeActions.find((codeAction) => {
+              return codeAction.title == "Generate Method";
+            });
+            assert.notEqual(codeAction, undefined, "Code action not found");
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "\n\tprivate function myMethod():void\n\t{\n\t}\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.strictEqual(
+              range.start.line,
+              23,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              23,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider can generate member method without parameters with this member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "GenerateMethod.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(7, 10);
+      let end = new vscode.Position(7, 10);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let codeAction = codeActions.find((codeAction) => {
+              return codeAction.title == "Generate Method";
+            });
+            assert.notEqual(codeAction, undefined, "Code action not found");
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "\n\t\tprivate function myMethod():void\n\t\t{\n\t\t}\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.strictEqual(
+              range.start.line,
+              11,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              11,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider can generate member method without parameters with this member access for file-internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "GenerateMethod.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(19, 10);
+      let end = new vscode.Position(19, 10);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let codeAction = codeActions.find((codeAction) => {
+              return codeAction.title == "Generate Method";
+            });
+            assert.notEqual(codeAction, undefined, "Code action not found");
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "\n\tprivate function myMethod():void\n\t{\n\t}\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.strictEqual(
+              range.start.line,
+              23,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              23,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider can generate member method with parameters", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "GenerateMethod.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(8, 6);
+      let end = new vscode.Position(8, 6);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let codeAction = codeActions.find((codeAction) => {
+              return codeAction.title == "Generate Method";
+            });
+            assert.notEqual(codeAction, undefined, "Code action not found");
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "\n\t\tprivate function myMethod(param0:Number, param1:Boolean, param2:String):void\n\t\t{\n\t\t}\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.strictEqual(
+              range.start.line,
+              11,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              11,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeCodeActionProvider can generate member method with parameters for file-internal class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "GenerateMethod.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(20, 4);
+      let end = new vscode.Position(20, 4);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let codeAction = codeActions.find((codeAction) => {
+              return codeAction.title == "Generate Method";
+            });
+            assert.notEqual(codeAction, undefined, "Code action not found");
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "\n\tprivate function myMethod(param0:Number, param1:Boolean, param2:String):void\n\t{\n\t}\n",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.strictEqual(
+              range.start.line,
+              23,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              0,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              23,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              0,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test('vscode.executeCodeActionProvider must not generate member method with from "new" expression', () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "GenerateMethod.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(9, 6);
+      let end = new vscode.Position(9, 6);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let codeAction = codeActions.find((codeAction) => {
+              return codeAction.title == "Generate Method";
+            });
+            assert.strictEqual(
+              codeAction,
+              undefined,
+              "Code action incorrectly found"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test('vscode.executeCodeActionProvider must not generate member method with from "new" expression in file-internal class', () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "GenerateMethod.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(21, 8);
+      let end = new vscode.Position(21, 8);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let codeAction = codeActions.find((codeAction) => {
+              return codeAction.title == "Generate Method";
+            });
+            assert.strictEqual(
+              codeAction,
+              undefined,
+              "Code action incorrectly found"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
 });
 
-suite("code action provider: generate field variable : Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeCodeActionProvider can generate field variable without this member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateVariable.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(6, 4);
-			let end = new vscode.Position(6, 4);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Field Variable";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\t\tpublic var myVar:Object;\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 9, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 9, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate field variable without this member access for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateVariable.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(16, 4);
-			let end = new vscode.Position(16, 4);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Field Variable";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\tpublic var myVar:Object;\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 19, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 19, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate field variable with this member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateVariable.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(7, 10);
-			let end = new vscode.Position(7, 10);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Field Variable";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\t\tpublic var myVar:Object;\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 9, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 9, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
+suite(
+  "code action provider: generate getter and setter : Application workspace",
+  () => {
+    suiteTeardown(revertAndCloseAllEditors);
+    test("vscode.executeCodeActionProvider can generate getter without assignment", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(7, 16);
+        let end = new vscode.Position(7, 16);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title == "Generate 'get' accessor (make read-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _noAssignment:Object;\n\n\t\tpublic function get noAssignment():Object\n\t\t{\n\t\t\treturn _noAssignment;\n\t\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                7,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                2,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                7,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                33,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate getter without assignment for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(26, 14);
+        let end = new vscode.Position(26, 14);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title == "Generate 'get' accessor (make read-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _noAssignment:Object;\n\n\tpublic function get noAssignment():Object\n\t{\n\t\treturn _noAssignment;\n\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                26,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                1,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                26,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                32,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate setter without assignment", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(7, 16);
+        let end = new vscode.Position(7, 16);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title ==
+                  "Generate 'set' accessor (make write-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _noAssignment:Object;\n\n\t\tpublic function set noAssignment(value:Object):void\n\t\t{\n\t\t\t_noAssignment = value;\n\t\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                7,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                2,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                7,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                33,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate setter without assignment for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(26, 14);
+        let end = new vscode.Position(26, 14);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title ==
+                  "Generate 'set' accessor (make write-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _noAssignment:Object;\n\n\tpublic function set noAssignment(value:Object):void\n\t{\n\t\t_noAssignment = value;\n\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                26,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                1,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                26,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                32,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate getter and setter without assignment", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(7, 16);
+        let end = new vscode.Position(7, 16);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate 'get' and 'set' accessors";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _noAssignment:Object;\n\n\t\tpublic function get noAssignment():Object\n\t\t{\n\t\t\treturn _noAssignment;\n\t\t}\n\n\t\tpublic function set noAssignment(value:Object):void\n\t\t{\n\t\t\t_noAssignment = value;\n\t\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                7,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                2,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                7,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                33,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate getter and setter without assignment for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(26, 14);
+        let end = new vscode.Position(26, 14);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate 'get' and 'set' accessors";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _noAssignment:Object;\n\n\tpublic function get noAssignment():Object\n\t{\n\t\treturn _noAssignment;\n\t}\n\n\tpublic function set noAssignment(value:Object):void\n\t{\n\t\t_noAssignment = value;\n\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                26,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                1,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                26,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                32,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate getter with assignment", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(9, 16);
+        let end = new vscode.Position(9, 16);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title == "Generate 'get' accessor (make read-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                'private var _assignment:String = "hello";\n\n\t\tpublic function get assignment():String\n\t\t{\n\t\t\treturn _assignment;\n\t\t}',
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                9,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                2,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                9,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                41,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate getter with assignment for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(28, 14);
+        let end = new vscode.Position(28, 14);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title == "Generate 'get' accessor (make read-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                'private var _assignment:String = "hello";\n\n\tpublic function get assignment():String\n\t{\n\t\treturn _assignment;\n\t}',
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                28,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                1,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                28,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                40,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate setter with assignment", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(9, 16);
+        let end = new vscode.Position(9, 16);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title ==
+                  "Generate 'set' accessor (make write-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                'private var _assignment:String = "hello";\n\n\t\tpublic function set assignment(value:String):void\n\t\t{\n\t\t\t_assignment = value;\n\t\t}',
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                9,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                2,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                9,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                41,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate setter with assignment for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(28, 14);
+        let end = new vscode.Position(28, 14);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title ==
+                  "Generate 'set' accessor (make write-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                'private var _assignment:String = "hello";\n\n\tpublic function set assignment(value:String):void\n\t{\n\t\t_assignment = value;\n\t}',
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                28,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                1,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                28,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                40,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate getter and setter with assignment", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(9, 16);
+        let end = new vscode.Position(9, 16);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate 'get' and 'set' accessors";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                'private var _assignment:String = "hello";\n\n\t\tpublic function get assignment():String\n\t\t{\n\t\t\treturn _assignment;\n\t\t}\n\n\t\tpublic function set assignment(value:String):void\n\t\t{\n\t\t\t_assignment = value;\n\t\t}',
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                9,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                2,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                9,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                41,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate getter and setter with assignment for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(28, 14);
+        let end = new vscode.Position(28, 14);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate 'get' and 'set' accessors";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                'private var _assignment:String = "hello";\n\n\tpublic function get assignment():String\n\t{\n\t\treturn _assignment;\n\t}\n\n\tpublic function set assignment(value:String):void\n\t{\n\t\t_assignment = value;\n\t}',
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                28,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                1,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                28,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                40,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate static getter without assignment", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(11, 24);
+        let end = new vscode.Position(11, 24);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title == "Generate 'get' accessor (make read-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private static var _isStatic:Boolean;\n\n\t\tpublic static function get isStatic():Boolean\n\t\t{\n\t\t\treturn _isStatic;\n\t\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                11,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                2,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                11,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                37,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate static getter without assignment for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(30, 22);
+        let end = new vscode.Position(30, 22);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title == "Generate 'get' accessor (make read-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private static var _isStatic:Boolean;\n\n\tpublic static function get isStatic():Boolean\n\t{\n\t\treturn _isStatic;\n\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                30,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                1,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                30,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                36,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate static setter without assignment", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(11, 24);
+        let end = new vscode.Position(11, 24);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title ==
+                  "Generate 'set' accessor (make write-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private static var _isStatic:Boolean;\n\n\t\tpublic static function set isStatic(value:Boolean):void\n\t\t{\n\t\t\t_isStatic = value;\n\t\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                11,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                2,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                11,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                37,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate static setter without assignment for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(30, 22);
+        let end = new vscode.Position(30, 22);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title ==
+                  "Generate 'set' accessor (make write-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private static var _isStatic:Boolean;\n\n\tpublic static function set isStatic(value:Boolean):void\n\t{\n\t\t_isStatic = value;\n\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                30,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                1,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                30,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                36,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate static getter and setter without assignment", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(11, 24);
+        let end = new vscode.Position(11, 24);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate 'get' and 'set' accessors";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private static var _isStatic:Boolean;\n\n\t\tpublic static function get isStatic():Boolean\n\t\t{\n\t\t\treturn _isStatic;\n\t\t}\n\n\t\tpublic static function set isStatic(value:Boolean):void\n\t\t{\n\t\t\t_isStatic = value;\n\t\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                11,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                2,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                11,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                37,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate static getter and setter without assignment for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(30, 22);
+        let end = new vscode.Position(30, 22);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate 'get' and 'set' accessors";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private static var _isStatic:Boolean;\n\n\tpublic static function get isStatic():Boolean\n\t{\n\t\treturn _isStatic;\n\t}\n\n\tpublic static function set isStatic(value:Boolean):void\n\t{\n\t\t_isStatic = value;\n\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                30,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                1,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                30,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                36,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate private getter without assignment", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(13, 16);
+        let end = new vscode.Position(13, 16);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title == "Generate 'get' accessor (make read-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _isPrivate:Object;\n\n\t\tprivate function get isPrivate():Object\n\t\t{\n\t\t\treturn _isPrivate;\n\t\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                13,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                2,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                13,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                31,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate private getter without assignment for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(32, 14);
+        let end = new vscode.Position(32, 14);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title == "Generate 'get' accessor (make read-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _isPrivate:Object;\n\n\tprivate function get isPrivate():Object\n\t{\n\t\treturn _isPrivate;\n\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                32,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                1,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                32,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                30,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate private setter without assignment", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(13, 16);
+        let end = new vscode.Position(13, 16);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title ==
+                  "Generate 'set' accessor (make write-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _isPrivate:Object;\n\n\t\tprivate function set isPrivate(value:Object):void\n\t\t{\n\t\t\t_isPrivate = value;\n\t\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                13,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                2,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                13,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                31,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate private setter without assignment for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(32, 14);
+        let end = new vscode.Position(32, 14);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title ==
+                  "Generate 'set' accessor (make write-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _isPrivate:Object;\n\n\tprivate function set isPrivate(value:Object):void\n\t{\n\t\t_isPrivate = value;\n\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                32,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                1,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                32,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                30,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate private getter and setter without assignment", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(13, 16);
+        let end = new vscode.Position(13, 16);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate 'get' and 'set' accessors";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _isPrivate:Object;\n\n\t\tprivate function get isPrivate():Object\n\t\t{\n\t\t\treturn _isPrivate;\n\t\t}\n\n\t\tprivate function set isPrivate(value:Object):void\n\t\t{\n\t\t\t_isPrivate = value;\n\t\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                13,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                2,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                13,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                31,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate private getter and setter without assignment for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(32, 14);
+        let end = new vscode.Position(32, 14);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate 'get' and 'set' accessors";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _isPrivate:Object;\n\n\tprivate function get isPrivate():Object\n\t{\n\t\treturn _isPrivate;\n\t}\n\n\tprivate function set isPrivate(value:Object):void\n\t{\n\t\t_isPrivate = value;\n\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                32,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                1,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                32,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                30,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate getter without type without assignment", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(15, 16);
+        let end = new vscode.Position(15, 16);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title == "Generate 'get' accessor (make read-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _noType;\n\n\t\tpublic function get noType()\n\t\t{\n\t\t\treturn _noType;\n\t\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                15,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                2,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                15,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                20,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate getter without type without assignment for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(34, 14);
+        let end = new vscode.Position(34, 14);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title == "Generate 'get' accessor (make read-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _noType;\n\n\tpublic function get noType()\n\t{\n\t\treturn _noType;\n\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                34,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                1,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                34,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                19,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate setter without type without assignment", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(15, 16);
+        let end = new vscode.Position(15, 16);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title ==
+                  "Generate 'set' accessor (make write-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _noType;\n\n\t\tpublic function set noType(value):void\n\t\t{\n\t\t\t_noType = value;\n\t\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                15,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                2,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                15,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                20,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate setter without type without assignment for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(34, 14);
+        let end = new vscode.Position(34, 14);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return (
+                  codeAction.title ==
+                  "Generate 'set' accessor (make write-only)"
+                );
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _noType;\n\n\tpublic function set noType(value):void\n\t{\n\t\t_noType = value;\n\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                34,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                1,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                34,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                19,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate getter and setter without type without assignment", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(15, 16);
+        let end = new vscode.Position(15, 16);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate 'get' and 'set' accessors";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _noType;\n\n\t\tpublic function get noType()\n\t\t{\n\t\t\treturn _noType;\n\t\t}\n\n\t\tpublic function set noType(value):void\n\t\t{\n\t\t\t_noType = value;\n\t\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                15,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                2,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                15,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                20,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider can generate getter and setter without type without assignment for file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateGetterAndSetter.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(34, 14);
+        let end = new vscode.Position(34, 14);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate 'get' and 'set' accessors";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.RefactorRewrite.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "private var _noType;\n\n\tpublic function get noType()\n\t{\n\t\treturn _noType;\n\t}\n\n\tpublic function set noType(value):void\n\t{\n\t\t_noType = value;\n\t}",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                34,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                1,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                34,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                19,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+  }
+);
 
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate field variable with this member access for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateVariable.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(17, 10);
-			let end = new vscode.Position(17, 10);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Field Variable";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\tpublic var myVar:Object;\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 19, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 19, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
+suite("code action provider: generate catch : Application workspace", () => {
+  suiteTeardown(revertAndCloseAllEditors);
+  test("vscode.executeCodeActionProvider can generate catch", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "CodeActionsTry.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(6, 4);
+      let end = new vscode.Position(6, 4);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let codeAction = codeActions.find((codeAction) => {
+              return codeAction.title == "Generate catch";
+            });
+            assert.notEqual(codeAction, undefined, "Code action not found");
+            assert.strictEqual(
+              codeAction.command,
+              undefined,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.QuickFix.value,
+              "Code action provided incorrect kind"
+            );
+            let workspaceEdit = codeAction.edit;
+            assert.notEqual(
+              workspaceEdit,
+              undefined,
+              "Code action missing workspace edit"
+            );
+            assert.ok(
+              workspaceEdit.has(uri),
+              "Code action workspace edit missing URI: " + uri
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(textEdits.length, 1);
+            let textEdit = textEdits[0];
+            assert.strictEqual(
+              textEdit.newText,
+              "\n\t\t\tcatch(e:Error)\n\t\t\t{\n\t\t\t}",
+              "Code action workspace edit provided incorrect new text"
+            );
+            let range = textEdit.range;
+            assert.strictEqual(
+              range.start.line,
+              8,
+              "Code action workspace edit provided incorrect start line"
+            );
+            assert.strictEqual(
+              range.start.character,
+              4,
+              "Code action workspace edit provided incorrect start character"
+            );
+            assert.strictEqual(
+              range.end.line,
+              8,
+              "Code action workspace edit provided incorrect end line"
+            );
+            assert.strictEqual(
+              range.end.character,
+              4,
+              "Code action workspace edit provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
 });
 
-suite("code action provider: generate method : Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeCodeActionProvider can generate member method without parameters without this member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateMethod.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(6, 6);
-			let end = new vscode.Position(6, 6);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Method";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\t\tprivate function myMethod():void\n\t\t{\n\t\t}\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 11, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 11, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate member method without parameters without this member access for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateMethod.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(18, 4);
-			let end = new vscode.Position(18, 4);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Method";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\tprivate function myMethod():void\n\t{\n\t}\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 23, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 23, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate member method without parameters with this member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateMethod.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(7, 10);
-			let end = new vscode.Position(7, 10);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Method";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\t\tprivate function myMethod():void\n\t\t{\n\t\t}\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 11, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 11, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate member method without parameters with this member access for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateMethod.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(19, 10);
-			let end = new vscode.Position(19, 10);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Method";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\tprivate function myMethod():void\n\t{\n\t}\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 23, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 23, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
+suite(
+  "code action provider: generate event listener : Application workspace",
+  () => {
+    suiteTeardown(revertAndCloseAllEditors);
+    test("vscode.executeCodeActionProvider finds generate event listener with string literal and no metadata", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateEventListener.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(13, 61);
+        let end = new vscode.Position(13, 61);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Event Listener";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.QuickFix.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "\n\t\tprivate function literalWithoutMetadataListener(event:Object):void\n\t\t{\n\t\t}\n",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                25,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                0,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                25,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                0,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider finds generate event listener with string literal and metadata with missing class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateEventListener.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(14, 81);
+        let end = new vscode.Position(14, 81);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Event Listener";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.QuickFix.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "\n\t\tprivate function literalWithMetadataButMissingMetadataClassListener(event:Object):void\n\t\t{\n\t\t}\n",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                25,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                0,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                25,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                0,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider finds generate event listener with string literal and full metadata", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateEventListener.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(15, 66);
+        let end = new vscode.Position(15, 66);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Event Listener";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.QuickFix.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "\n\t\tprivate function literalWithMetadataAndClassListener(event:GenerateEventEvent):void\n\t\t{\n\t\t}\n",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                25,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                0,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                25,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                0,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider finds generate event listener with constant and no metadata", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateEventListener.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(16, 81);
+        let end = new vscode.Position(16, 81);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Event Listener";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.QuickFix.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "\n\t\tprivate function constantWithoutMetadataListener(event:Object):void\n\t\t{\n\t\t}\n",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                25,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                0,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                25,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                0,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider finds generate event listener with constant and metadata with missing class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateEventListener.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(17, 105);
+        let end = new vscode.Position(17, 105);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Event Listener";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.QuickFix.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "\n\t\tprivate function constantWithMetadataButMissingMetadataClassListener(event:Object):void\n\t\t{\n\t\t}\n",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                25,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                0,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                25,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                0,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider finds generate event listener with constant and full metadata", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateEventListener.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(18, 88);
+        let end = new vscode.Position(18, 88);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Event Listener";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.QuickFix.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "\n\t\tprivate function constantWithMetadataAndClassListener(event:GenerateEventEvent):void\n\t\t{\n\t\t}\n",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                25,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                0,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                25,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                0,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider finds generate event listener with explicit this member access on addEventListener", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateEventListener.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(19, 82);
+        let end = new vscode.Position(19, 82);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Event Listener";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.QuickFix.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "\n\t\tprivate function explicitThisListener(event:GenerateEventEvent):void\n\t\t{\n\t\t}\n",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                25,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                0,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                25,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                0,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider finds generate event listener with implement this member access on addEventListener", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateEventListener.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(20, 77);
+        let end = new vscode.Position(20, 77);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Event Listener";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.QuickFix.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "\n\t\tprivate function implicitThisListener(event:GenerateEventEvent):void\n\t\t{\n\t\t}\n",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                25,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                0,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                25,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                0,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider finds generate event listener with member access before listener name", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateEventListener.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(21, 93);
+        let end = new vscode.Position(21, 93);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Event Listener";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.QuickFix.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "\n\t\tprivate function listenerWithMemberAccess(event:GenerateEventEvent):void\n\t\t{\n\t\t}\n",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                25,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                0,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                25,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                0,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider omits generate event listener with non-this member access before listener name", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateEventListener.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(22, 99);
+        let end = new vscode.Position(22, 99);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Event Listener";
+              });
+              assert.strictEqual(
+                codeAction,
+                undefined,
+                "Code action must not be found"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider omits generate event listener with function that already exists", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateEventListener.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(23, 88);
+        let end = new vscode.Position(23, 88);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Event Listener";
+              });
+              assert.strictEqual(
+                codeAction,
+                undefined,
+                "Code action must not be found"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+    test("vscode.executeCodeActionProvider finds generate event listener in file-internal class", () => {
+      let uri = vscode.Uri.file(
+        path.join(
+          vscode.workspace.workspaceFolders[0].uri.fsPath,
+          "src",
+          "GenerateEventListener.as"
+        )
+      );
+      return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+        let start = new vscode.Position(36, 87);
+        let end = new vscode.Position(36, 87);
+        let range = new vscode.Range(start, end);
+        return vscode.commands
+          .executeCommand("vscode.executeCodeActionProvider", uri, range)
+          .then(
+            (codeActions: vscode.CodeAction[]) => {
+              let codeAction = codeActions.find((codeAction) => {
+                return codeAction.title == "Generate Event Listener";
+              });
+              assert.notEqual(codeAction, undefined, "Code action not found");
+              assert.strictEqual(
+                codeAction.command,
+                undefined,
+                "Code action provided incorrect command"
+              );
+              assert.strictEqual(
+                codeAction.kind.value,
+                vscode.CodeActionKind.QuickFix.value,
+                "Code action provided incorrect kind"
+              );
+              let workspaceEdit = codeAction.edit;
+              assert.notEqual(
+                workspaceEdit,
+                undefined,
+                "Code action missing workspace edit"
+              );
+              assert.ok(
+                workspaceEdit.has(uri),
+                "Code action workspace edit missing URI: " + uri
+              );
+              let textEdits = workspaceEdit.get(uri);
+              assert.strictEqual(textEdits.length, 1);
+              let textEdit = textEdits[0];
+              assert.strictEqual(
+                textEdit.newText,
+                "\n\tprivate function constantWithMetadataAndClassListener(event:GenerateEventEvent):void\n\t{\n\t}\n",
+                "Code action workspace edit provided incorrect new text"
+              );
+              let range = textEdit.range;
+              assert.strictEqual(
+                range.start.line,
+                38,
+                "Code action workspace edit provided incorrect start line"
+              );
+              assert.strictEqual(
+                range.start.character,
+                0,
+                "Code action workspace edit provided incorrect start character"
+              );
+              assert.strictEqual(
+                range.end.line,
+                38,
+                "Code action workspace edit provided incorrect end line"
+              );
+              assert.strictEqual(
+                range.end.character,
+                0,
+                "Code action workspace edit provided incorrect end character"
+              );
+            },
+            (err) => {
+              assert(false, "Failed to execute code actions provider: " + uri);
+            }
+          );
+      });
+    });
+  }
+);
 
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate member method with parameters", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateMethod.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(8, 6);
-			let end = new vscode.Position(8, 6);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Method";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\t\tprivate function myMethod(param0:Number, param1:Boolean, param2:String):void\n\t\t{\n\t\t}\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 11, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 11, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate member method with parameters for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateMethod.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(20, 4);
-			let end = new vscode.Position(20, 4);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Method";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\tprivate function myMethod(param0:Number, param1:Boolean, param2:String):void\n\t{\n\t}\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 23, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 23, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider must not generate member method with from \"new\" expression", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateMethod.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(9, 6);
-			let end = new vscode.Position(9, 6);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Method";
-						});
-						assert.strictEqual(codeAction, undefined, "Code action incorrectly found");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider must not generate member method with from \"new\" expression in file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateMethod.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(21, 8);
-			let end = new vscode.Position(21, 8);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Method";
-						});
-						assert.strictEqual(codeAction, undefined, "Code action incorrectly found");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
+suite("organize imports: Application workspace", () => {
+  teardown(revertAndCloseActiveEditor);
+  test("vscode.executeCodeActionProvider finds organize imports", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "OrganizeImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      let start = new vscode.Position(2, 45);
+      let end = new vscode.Position(2, 45);
+      let range = new vscode.Range(start, end);
+      return vscode.commands
+        .executeCommand("vscode.executeCodeActionProvider", uri, range)
+        .then(
+          (codeActions: vscode.CodeAction[]) => {
+            let codeAction = codeActions.find(
+              (codeAction: vscode.CodeAction) => {
+                return (
+                  codeAction.kind.value ===
+                  vscode.CodeActionKind.SourceOrganizeImports.value
+                );
+              }
+            );
+            assert.notEqual(codeAction, null, "Code action not found");
+            assert.strictEqual(
+              codeAction.title,
+              "Organize Imports",
+              "Code action provided incorrect title"
+            );
+            assert.strictEqual(
+              codeAction.kind.value,
+              vscode.CodeActionKind.SourceOrganizeImports.value,
+              "Code action provided incorrect kind"
+            );
+            let command = codeAction.command;
+            assert.notEqual(command, null, "Code action command not found");
+            assert.strictEqual(
+              command.command,
+              COMMAND_ORGANIZE_IMPORTS_IN_URI,
+              "Code action provided incorrect command"
+            );
+            assert.strictEqual(
+              command.title,
+              "Organize Imports",
+              "Code action provided incorrect command title"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute code actions provider: " + uri);
+          }
+        );
+    });
+  });
+  test("as3mxml.organizeImportsInUri organizes imports in ActionScript: removes unused imports, adds missing imports, and reorganizes remaining imports in alphabetical order", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "OrganizeImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(COMMAND_ORGANIZE_IMPORTS_IN_URI, uri)
+        .then(
+          () => {
+            return new Promise((resolve, reject) => {
+              //the text edit is not applied immediately, so give
+              //it a short delay before we check
+              setTimeout(() => {
+                let start = new vscode.Position(2, 0);
+                let end = new vscode.Position(12, 0);
+                let range = new vscode.Range(start, end);
+                let generatedText = editor.document.getText(range);
+                assert.strictEqual(
+                  generatedText,
+                  "\timport com.example.organizeImports.ImportToAdd;\n\timport com.example.organizeImports.ImportToAddFromAsOperator;\n\timport com.example.organizeImports.ImportToAddFromCast;\n\timport com.example.organizeImports.ImportToAddFromIsOperator;\n\timport com.example.organizeImports.ImportToAddFromNew;\n\timport com.example.organizeImports.ImportToAddFromReturnType;\n\timport com.example.organizeImports.ImportToKeepClass;\n\timport com.example.organizeImports.ImportToKeepInterface;\n\timport com.example.organizeImports.wildcards.*;\n\n",
+                  "as3mxml.organizeImportsInUri failed to organize imports"
+                );
+                resolve();
+              }, 1000);
+            });
+          },
+          (err) => {
+            assert(false, "Failed to execute organize imports command: " + uri);
+          }
+        );
+    });
+  });
+  test("as3mxml.organizeImportsInUri organizes imports in MXML: removes unused imports, adds missing imports, and reorganizes remaining imports in alphabetical order", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "MXMLOrganizeImports.mxml"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(COMMAND_ORGANIZE_IMPORTS_IN_URI, uri)
+        .then(
+          () => {
+            return new Promise((resolve, reject) => {
+              //the text edit is not applied immediately, so give
+              //it a short delay before we check
+              setTimeout(() => {
+                let start = new vscode.Position(5, 0);
+                let end = new vscode.Position(15, 0);
+                let range = new vscode.Range(start, end);
+                let generatedText = editor.document.getText(range);
+                assert.strictEqual(
+                  generatedText,
+                  "\t\t\timport com.example.organizeImports.ImportToAdd;\n\t\t\timport com.example.organizeImports.ImportToAddFromAsOperator;\n\t\t\timport com.example.organizeImports.ImportToAddFromCast;\n\t\t\timport com.example.organizeImports.ImportToAddFromIsOperator;\n\t\t\timport com.example.organizeImports.ImportToAddFromNew;\n\t\t\timport com.example.organizeImports.ImportToAddFromReturnType;\n\t\t\timport com.example.organizeImports.ImportToKeepClass;\n\t\t\timport com.example.organizeImports.ImportToKeepInterface;\n\t\t\timport com.example.organizeImports.wildcards.*;\n\n",
+                  "as3mxml.organizeImportsInUri failed to organize imports"
+                );
+                resolve();
+              }, 1000);
+            });
+          },
+          (err) => {
+            assert(false, "Failed to execute organize imports command: " + uri);
+          }
+        );
+    });
+  });
+  //BowlerHatLLC/vscode-as3mxml#182
+  test("as3mxml.organizeImportsInUri must be able to remove all imports, if necessary", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "RemoveAllImports.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(COMMAND_ORGANIZE_IMPORTS_IN_URI, uri)
+        .then(
+          () => {
+            return new Promise((resolve, reject) => {
+              //the text edit is not applied immediately, so give
+              //it a short delay before we check
+              setTimeout(() => {
+                let start = new vscode.Position(2, 0);
+                let end = new vscode.Position(3, 0);
+                let range = new vscode.Range(start, end);
+                let generatedText = editor.document.getText(range);
+                assert.strictEqual(
+                  generatedText,
+                  "\n",
+                  "as3mxml.organizeImportsInUri failed to organize imports"
+                );
+                resolve();
+              }, 1000);
+            });
+          },
+          (err) => {
+            assert(false, "Failed to execute organize imports command: " + uri);
+          }
+        );
+    });
+  });
 });
 
-suite("code action provider: generate getter and setter : Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeCodeActionProvider can generate getter without assignment", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(7, 16);
-			let end = new vscode.Position(7, 16);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' accessor (make read-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _noAssignment:Object;\n\n\t\tpublic function get noAssignment():Object\n\t\t{\n\t\t\treturn _noAssignment;\n\t\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 7, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 2, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 7, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 33, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate getter without assignment for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(26, 14);
-			let end = new vscode.Position(26, 14);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' accessor (make read-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _noAssignment:Object;\n\n\tpublic function get noAssignment():Object\n\t{\n\t\treturn _noAssignment;\n\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 26, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 1, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 26, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 32, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate setter without assignment", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(7, 16);
-			let end = new vscode.Position(7, 16);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'set' accessor (make write-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _noAssignment:Object;\n\n\t\tpublic function set noAssignment(value:Object):void\n\t\t{\n\t\t\t_noAssignment = value;\n\t\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 7, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 2, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 7, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 33, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate setter without assignment for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(26, 14);
-			let end = new vscode.Position(26, 14);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'set' accessor (make write-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _noAssignment:Object;\n\n\tpublic function set noAssignment(value:Object):void\n\t{\n\t\t_noAssignment = value;\n\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 26, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 1, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 26, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 32, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate getter and setter without assignment", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(7, 16);
-			let end = new vscode.Position(7, 16);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' and 'set' accessors";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _noAssignment:Object;\n\n\t\tpublic function get noAssignment():Object\n\t\t{\n\t\t\treturn _noAssignment;\n\t\t}\n\n\t\tpublic function set noAssignment(value:Object):void\n\t\t{\n\t\t\t_noAssignment = value;\n\t\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 7, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 2, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 7, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 33, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate getter and setter without assignment for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(26, 14);
-			let end = new vscode.Position(26, 14);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' and 'set' accessors";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _noAssignment:Object;\n\n\tpublic function get noAssignment():Object\n\t{\n\t\treturn _noAssignment;\n\t}\n\n\tpublic function set noAssignment(value:Object):void\n\t{\n\t\t_noAssignment = value;\n\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 26, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 1, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 26, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 32, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate getter with assignment", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(9, 16);
-			let end = new vscode.Position(9, 16);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' accessor (make read-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _assignment:String = \"hello\";\n\n\t\tpublic function get assignment():String\n\t\t{\n\t\t\treturn _assignment;\n\t\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 9, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 2, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 9, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 41, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate getter with assignment for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(28, 14);
-			let end = new vscode.Position(28, 14);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' accessor (make read-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _assignment:String = \"hello\";\n\n\tpublic function get assignment():String\n\t{\n\t\treturn _assignment;\n\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 28, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 1, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 28, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 40, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate setter with assignment", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(9, 16);
-			let end = new vscode.Position(9, 16);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'set' accessor (make write-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _assignment:String = \"hello\";\n\n\t\tpublic function set assignment(value:String):void\n\t\t{\n\t\t\t_assignment = value;\n\t\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 9, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 2, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 9, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 41, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate setter with assignment for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(28, 14);
-			let end = new vscode.Position(28, 14);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'set' accessor (make write-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _assignment:String = \"hello\";\n\n\tpublic function set assignment(value:String):void\n\t{\n\t\t_assignment = value;\n\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 28, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 1, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 28, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 40, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate getter and setter with assignment", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(9, 16);
-			let end = new vscode.Position(9, 16);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' and 'set' accessors";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _assignment:String = \"hello\";\n\n\t\tpublic function get assignment():String\n\t\t{\n\t\t\treturn _assignment;\n\t\t}\n\n\t\tpublic function set assignment(value:String):void\n\t\t{\n\t\t\t_assignment = value;\n\t\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 9, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 2, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 9, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 41, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate getter and setter with assignment for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(28, 14);
-			let end = new vscode.Position(28, 14);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' and 'set' accessors";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _assignment:String = \"hello\";\n\n\tpublic function get assignment():String\n\t{\n\t\treturn _assignment;\n\t}\n\n\tpublic function set assignment(value:String):void\n\t{\n\t\t_assignment = value;\n\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 28, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 1, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 28, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 40, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate static getter without assignment", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(11, 24);
-			let end = new vscode.Position(11, 24);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' accessor (make read-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private static var _isStatic:Boolean;\n\n\t\tpublic static function get isStatic():Boolean\n\t\t{\n\t\t\treturn _isStatic;\n\t\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 11, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 2, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 11, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 37, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate static getter without assignment for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(30, 22);
-			let end = new vscode.Position(30, 22);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' accessor (make read-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private static var _isStatic:Boolean;\n\n\tpublic static function get isStatic():Boolean\n\t{\n\t\treturn _isStatic;\n\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 30, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 1, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 30, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 36, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate static setter without assignment", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(11, 24);
-			let end = new vscode.Position(11, 24);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'set' accessor (make write-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private static var _isStatic:Boolean;\n\n\t\tpublic static function set isStatic(value:Boolean):void\n\t\t{\n\t\t\t_isStatic = value;\n\t\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 11, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 2, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 11, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 37, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate static setter without assignment for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(30, 22);
-			let end = new vscode.Position(30, 22);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'set' accessor (make write-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private static var _isStatic:Boolean;\n\n\tpublic static function set isStatic(value:Boolean):void\n\t{\n\t\t_isStatic = value;\n\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 30, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 1, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 30, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 36, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate static getter and setter without assignment", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(11, 24);
-			let end = new vscode.Position(11, 24);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' and 'set' accessors";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private static var _isStatic:Boolean;\n\n\t\tpublic static function get isStatic():Boolean\n\t\t{\n\t\t\treturn _isStatic;\n\t\t}\n\n\t\tpublic static function set isStatic(value:Boolean):void\n\t\t{\n\t\t\t_isStatic = value;\n\t\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 11, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 2, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 11, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 37, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate static getter and setter without assignment for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(30, 22);
-			let end = new vscode.Position(30, 22);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' and 'set' accessors";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private static var _isStatic:Boolean;\n\n\tpublic static function get isStatic():Boolean\n\t{\n\t\treturn _isStatic;\n\t}\n\n\tpublic static function set isStatic(value:Boolean):void\n\t{\n\t\t_isStatic = value;\n\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 30, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 1, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 30, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 36, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate private getter without assignment", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(13, 16);
-			let end = new vscode.Position(13, 16);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' accessor (make read-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _isPrivate:Object;\n\n\t\tprivate function get isPrivate():Object\n\t\t{\n\t\t\treturn _isPrivate;\n\t\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 13, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 2, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 13, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 31, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate private getter without assignment for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(32, 14);
-			let end = new vscode.Position(32, 14);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' accessor (make read-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _isPrivate:Object;\n\n\tprivate function get isPrivate():Object\n\t{\n\t\treturn _isPrivate;\n\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 32, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 1, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 32, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 30, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate private setter without assignment", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(13, 16);
-			let end = new vscode.Position(13, 16);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'set' accessor (make write-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _isPrivate:Object;\n\n\t\tprivate function set isPrivate(value:Object):void\n\t\t{\n\t\t\t_isPrivate = value;\n\t\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 13, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 2, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 13, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 31, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate private setter without assignment for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(32, 14);
-			let end = new vscode.Position(32, 14);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'set' accessor (make write-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _isPrivate:Object;\n\n\tprivate function set isPrivate(value:Object):void\n\t{\n\t\t_isPrivate = value;\n\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 32, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 1, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 32, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 30, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate private getter and setter without assignment", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(13, 16);
-			let end = new vscode.Position(13, 16);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' and 'set' accessors";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _isPrivate:Object;\n\n\t\tprivate function get isPrivate():Object\n\t\t{\n\t\t\treturn _isPrivate;\n\t\t}\n\n\t\tprivate function set isPrivate(value:Object):void\n\t\t{\n\t\t\t_isPrivate = value;\n\t\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 13, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 2, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 13, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 31, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate private getter and setter without assignment for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(32, 14);
-			let end = new vscode.Position(32, 14);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' and 'set' accessors";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _isPrivate:Object;\n\n\tprivate function get isPrivate():Object\n\t{\n\t\treturn _isPrivate;\n\t}\n\n\tprivate function set isPrivate(value:Object):void\n\t{\n\t\t_isPrivate = value;\n\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 32, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 1, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 32, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 30, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate getter without type without assignment", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(15, 16);
-			let end = new vscode.Position(15, 16);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' accessor (make read-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _noType;\n\n\t\tpublic function get noType()\n\t\t{\n\t\t\treturn _noType;\n\t\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 15, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 2, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 15, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 20, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate getter without type without assignment for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(34, 14);
-			let end = new vscode.Position(34, 14);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' accessor (make read-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _noType;\n\n\tpublic function get noType()\n\t{\n\t\treturn _noType;\n\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 34, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 1, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 34, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 19, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate setter without type without assignment", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(15, 16);
-			let end = new vscode.Position(15, 16);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'set' accessor (make write-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _noType;\n\n\t\tpublic function set noType(value):void\n\t\t{\n\t\t\t_noType = value;\n\t\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 15, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 2, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 15, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 20, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate setter without type without assignment for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(34, 14);
-			let end = new vscode.Position(34, 14);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'set' accessor (make write-only)";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _noType;\n\n\tpublic function set noType(value):void\n\t{\n\t\t_noType = value;\n\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 34, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 1, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 34, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 19, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate getter and setter without type without assignment", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(15, 16);
-			let end = new vscode.Position(15, 16);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' and 'set' accessors";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _noType;\n\n\t\tpublic function get noType()\n\t\t{\n\t\t\treturn _noType;\n\t\t}\n\n\t\tpublic function set noType(value):void\n\t\t{\n\t\t\t_noType = value;\n\t\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 15, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 2, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 15, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 20, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider can generate getter and setter without type without assignment for file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateGetterAndSetter.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(34, 14);
-			let end = new vscode.Position(34, 14);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate 'get' and 'set' accessors";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.RefactorRewrite.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText,
-							"private var _noType;\n\n\tpublic function get noType()\n\t{\n\t\treturn _noType;\n\t}\n\n\tpublic function set noType(value):void\n\t{\n\t\t_noType = value;\n\t}",
-							"Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 34, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 1, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 34, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 19, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
+suite("includes: application workspace", () => {
+  suiteTeardown(revertAndCloseAllEditors);
+  test("vscode.executeDefinitionProvider finds definition of method before include statement", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "includes",
+        "Includes.as"
+      )
+    );
+    let position = new vscode.Position(4, 20);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of local variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              4,
+              "vscode.executeDefinitionProvider provided incorrect line for definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              18,
+              "vscode.executeDefinitionProvider provided incorrect character for definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of method between include statements", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "includes",
+        "Includes.as"
+      )
+    );
+    let position = new vscode.Position(8, 20);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of local variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              8,
+              "vscode.executeDefinitionProvider provided incorrect line for definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              18,
+              "vscode.executeDefinitionProvider provided incorrect character for definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of method after include statements", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "includes",
+        "Includes.as"
+      )
+    );
+    let position = new vscode.Position(12, 20);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of local variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              12,
+              "vscode.executeDefinitionProvider provided incorrect line for definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              18,
+              "vscode.executeDefinitionProvider provided incorrect character for definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of method in first file included with include statement", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "includes",
+        "scripts",
+        "include1.as"
+      )
+    );
+    let position = new vscode.Position(0, 18);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of local variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              0,
+              "vscode.executeDefinitionProvider provided incorrect line for definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              16,
+              "vscode.executeDefinitionProvider provided incorrect character for definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of method in second file included with include statement", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "includes",
+        "scripts",
+        "include2.as"
+      )
+    );
+    let position = new vscode.Position(1, 18);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of local variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            assert.strictEqual(
+              location.uri.toString(),
+              uri.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              1,
+              "vscode.executeDefinitionProvider provided incorrect line for definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              16,
+              "vscode.executeDefinitionProvider provided incorrect character for definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of method in one included file from another included file", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "includes",
+        "scripts",
+        "include2.as"
+      )
+    );
+    let position = new vscode.Position(3, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of local variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            let expectedURI = vscode.Uri.file(
+              path.join(
+                vscode.workspace.workspaceFolders[0].uri.fsPath,
+                "src",
+                "com",
+                "example",
+                "includes",
+                "scripts",
+                "include1.as"
+              )
+            );
+            assert.strictEqual(
+              location.uri.toString(),
+              expectedURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              0,
+              "vscode.executeDefinitionProvider provided incorrect line for definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              16,
+              "vscode.executeDefinitionProvider provided incorrect character for definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of method in main file from an included file", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "includes",
+        "scripts",
+        "include1.as"
+      )
+    );
+    let position = new vscode.Position(2, 3);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of local variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            let expectedURI = vscode.Uri.file(
+              path.join(
+                vscode.workspace.workspaceFolders[0].uri.fsPath,
+                "src",
+                "com",
+                "example",
+                "includes",
+                "Includes.as"
+              )
+            );
+            assert.strictEqual(
+              location.uri.toString(),
+              expectedURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              12,
+              "vscode.executeDefinitionProvider provided incorrect line for definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              18,
+              "vscode.executeDefinitionProvider provided incorrect character for definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDefinitionProvider finds definition of method in included file from main file", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "includes",
+        "Includes.as"
+      )
+    );
+    let position = new vscode.Position(14, 4);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDefinitionProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              1,
+              "vscode.executeDefinitionProvider failed to provide location of local variable definition: " +
+                uri
+            );
+            let location = locations[0];
+            let expectedURI = vscode.Uri.file(
+              path.join(
+                vscode.workspace.workspaceFolders[0].uri.fsPath,
+                "src",
+                "com",
+                "example",
+                "includes",
+                "scripts",
+                "include1.as"
+              )
+            );
+            assert.strictEqual(
+              location.uri.toString(),
+              expectedURI.toString(),
+              "vscode.executeDefinitionProvider provided incorrect uri for definition"
+            );
+            assert.strictEqual(
+              location.range.start.line,
+              0,
+              "vscode.executeDefinitionProvider provided incorrect line for definition"
+            );
+            assert.strictEqual(
+              location.range.start.character,
+              16,
+              "vscode.executeDefinitionProvider provided incorrect character for definition"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute definition provider: " + uri);
+          }
+        );
+    });
+  });
 });
 
-suite("code action provider: generate catch : Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeCodeActionProvider can generate catch", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "CodeActionsTry.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(6, 4);
-			let end = new vscode.Position(6, 4);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate catch";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\t\t\tcatch(e:Error)\n\t\t\t{\n\t\t\t}", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 8, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 4, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 8, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 4, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
+suite("reference provider: Application workspace", () => {
+  suiteTeardown(revertAndCloseAllEditors);
+  test("vscode.executeReferenceProvider finds references to local variable from its declaration", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(38, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeReferenceProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              2,
+              "vscode.executeReferenceProvider failed to provide locations: " +
+                uri
+            );
+            let location1 = locations[0];
+            assert.strictEqual(
+              location1.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location1.range.start.line,
+              38,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location1.range.start.character,
+              7,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location2 = locations[1];
+            assert.strictEqual(
+              location2.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location2.range.start.line,
+              86,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location2.range.start.character,
+              3,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute reference provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeReferenceProvider finds references to local variable from assignment that is not initialization", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(86, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeReferenceProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              2,
+              "vscode.executeReferenceProvider failed to provide locations: " +
+                uri
+            );
+            let location1 = locations[0];
+            assert.strictEqual(
+              location1.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location1.range.start.line,
+              38,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location1.range.start.character,
+              7,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location2 = locations[1];
+            assert.strictEqual(
+              location2.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location2.range.start.line,
+              86,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location2.range.start.character,
+              3,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute reference provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeReferenceProvider finds references to local function from its declaration", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(39, 15);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeReferenceProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              2,
+              "vscode.executeReferenceProvider failed to provide locations: " +
+                uri
+            );
+            let location1 = locations[0];
+            assert.strictEqual(
+              location1.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location1.range.start.line,
+              39,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location1.range.start.character,
+              12,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location2 = locations[1];
+            assert.strictEqual(
+              location2.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location2.range.start.line,
+              88,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location2.range.start.character,
+              3,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute reference provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeReferenceProvider finds references to local function from a call", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(88, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeReferenceProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              2,
+              "vscode.executeReferenceProvider failed to provide locations: " +
+                uri
+            );
+            let location1 = locations[0];
+            assert.strictEqual(
+              location1.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location1.range.start.line,
+              39,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location1.range.start.character,
+              12,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location2 = locations[1];
+            assert.strictEqual(
+              location2.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location2.range.start.line,
+              88,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location2.range.start.character,
+              3,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute reference provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeReferenceProvider finds references to member variable from its declaration", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(10, 16);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeReferenceProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              3,
+              "vscode.executeReferenceProvider failed to provide locations: " +
+                uri
+            );
+            let location1 = locations[0];
+            assert.strictEqual(
+              location1.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location1.range.start.line,
+              10,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location1.range.start.character,
+              14,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location2 = locations[1];
+            assert.strictEqual(
+              location2.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location2.range.start.line,
+              50,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location2.range.start.character,
+              3,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location3 = locations[2];
+            assert.strictEqual(
+              location3.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location3.range.start.line,
+              51,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location3.range.start.character,
+              8,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute reference provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeReferenceProvider finds references to member variable from assignment without this member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(50, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeReferenceProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              3,
+              "vscode.executeReferenceProvider failed to provide locations: " +
+                uri
+            );
+            let location1 = locations[0];
+            assert.strictEqual(
+              location1.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location1.range.start.line,
+              10,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location1.range.start.character,
+              14,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location2 = locations[1];
+            assert.strictEqual(
+              location2.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location2.range.start.line,
+              50,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location2.range.start.character,
+              3,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location3 = locations[2];
+            assert.strictEqual(
+              location3.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location3.range.start.line,
+              51,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location3.range.start.character,
+              8,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute reference provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeReferenceProvider finds references to member variable from assignment with this member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(51, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeReferenceProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              3,
+              "vscode.executeReferenceProvider failed to provide locations: " +
+                uri
+            );
+            let location1 = locations[0];
+            assert.strictEqual(
+              location1.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location1.range.start.line,
+              10,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location1.range.start.character,
+              14,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location2 = locations[1];
+            assert.strictEqual(
+              location2.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location2.range.start.line,
+              50,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location2.range.start.character,
+              3,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location3 = locations[2];
+            assert.strictEqual(
+              location3.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location3.range.start.line,
+              51,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location3.range.start.character,
+              8,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute reference provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeReferenceProvider finds references to member function from its declaration", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(12, 22);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeReferenceProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              3,
+              "vscode.executeReferenceProvider failed to provide locations: " +
+                uri
+            );
+            let location1 = locations[0];
+            assert.strictEqual(
+              location1.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location1.range.start.line,
+              12,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location1.range.start.character,
+              19,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location2 = locations[1];
+            assert.strictEqual(
+              location2.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location2.range.start.line,
+              41,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location2.range.start.character,
+              3,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location3 = locations[2];
+            assert.strictEqual(
+              location3.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location3.range.start.line,
+              42,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location3.range.start.character,
+              8,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute reference provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeReferenceProvider finds references to member function from call without this member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(41, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeReferenceProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              3,
+              "vscode.executeReferenceProvider failed to provide locations: " +
+                uri
+            );
+            let location1 = locations[0];
+            assert.strictEqual(
+              location1.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location1.range.start.line,
+              12,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location1.range.start.character,
+              19,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location2 = locations[1];
+            assert.strictEqual(
+              location2.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location2.range.start.line,
+              41,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location2.range.start.character,
+              3,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location3 = locations[2];
+            assert.strictEqual(
+              location3.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location3.range.start.line,
+              42,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location3.range.start.character,
+              8,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute reference provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeReferenceProvider finds references to member function from call with this member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(42, 10);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeReferenceProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              3,
+              "vscode.executeReferenceProvider failed to provide locations: " +
+                uri
+            );
+            let location1 = locations[0];
+            assert.strictEqual(
+              location1.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location1.range.start.line,
+              12,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location1.range.start.character,
+              19,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location2 = locations[1];
+            assert.strictEqual(
+              location2.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location2.range.start.line,
+              41,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location2.range.start.character,
+              3,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location3 = locations[2];
+            assert.strictEqual(
+              location3.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location3.range.start.line,
+              42,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location3.range.start.character,
+              8,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute reference provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeReferenceProvider finds references to static variable from its declaration", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(4, 22);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeReferenceProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              3,
+              "vscode.executeReferenceProvider failed to provide locations: " +
+                uri
+            );
+            let location1 = locations[0];
+            assert.strictEqual(
+              location1.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location1.range.start.line,
+              4,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location1.range.start.character,
+              20,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location2 = locations[1];
+            assert.strictEqual(
+              location2.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location2.range.start.line,
+              47,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location2.range.start.character,
+              3,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location3 = locations[2];
+            assert.strictEqual(
+              location3.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location3.range.start.line,
+              48,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location3.range.start.character,
+              14,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute reference provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeReferenceProvider finds references to static variable from assignment without type member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(47, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeReferenceProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              3,
+              "vscode.executeReferenceProvider failed to provide locations: " +
+                uri
+            );
+            let location1 = locations[0];
+            assert.strictEqual(
+              location1.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location1.range.start.line,
+              4,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location1.range.start.character,
+              20,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location2 = locations[1];
+            assert.strictEqual(
+              location2.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location2.range.start.line,
+              47,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location2.range.start.character,
+              3,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location3 = locations[2];
+            assert.strictEqual(
+              location3.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location3.range.start.line,
+              48,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location3.range.start.character,
+              14,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute reference provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeReferenceProvider finds references to static variable from assignment with type member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(48, 16);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeReferenceProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              3,
+              "vscode.executeReferenceProvider failed to provide locations: " +
+                uri
+            );
+            let location1 = locations[0];
+            assert.strictEqual(
+              location1.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location1.range.start.line,
+              4,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location1.range.start.character,
+              20,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location2 = locations[1];
+            assert.strictEqual(
+              location2.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location2.range.start.line,
+              47,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location2.range.start.character,
+              3,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location3 = locations[2];
+            assert.strictEqual(
+              location3.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location3.range.start.line,
+              48,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location3.range.start.character,
+              14,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute reference provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeReferenceProvider finds references to static function from its declaration", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(6, 28);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeReferenceProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              3,
+              "vscode.executeReferenceProvider failed to provide locations: " +
+                uri
+            );
+            let location1 = locations[0];
+            assert.strictEqual(
+              location1.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location1.range.start.line,
+              6,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location1.range.start.character,
+              26,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location2 = locations[1];
+            assert.strictEqual(
+              location2.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location2.range.start.line,
+              44,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location2.range.start.character,
+              3,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location3 = locations[2];
+            assert.strictEqual(
+              location3.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location3.range.start.line,
+              45,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location3.range.start.character,
+              14,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute reference provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeReferenceProvider finds references to static function from call without type member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(44, 5);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeReferenceProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              3,
+              "vscode.executeReferenceProvider failed to provide locations: " +
+                uri
+            );
+            let location1 = locations[0];
+            assert.strictEqual(
+              location1.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location1.range.start.line,
+              6,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location1.range.start.character,
+              26,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location2 = locations[1];
+            assert.strictEqual(
+              location2.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location2.range.start.line,
+              44,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location2.range.start.character,
+              3,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location3 = locations[2];
+            assert.strictEqual(
+              location3.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location3.range.start.line,
+              45,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location3.range.start.character,
+              14,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute reference provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeReferenceProvider finds references to static function from call with type member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(45, 16);
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeReferenceProvider", uri, position)
+        .then(
+          (locations: vscode.Location[]) => {
+            assert.strictEqual(
+              locations.length,
+              3,
+              "vscode.executeReferenceProvider failed to provide locations: " +
+                uri
+            );
+            let location1 = locations[0];
+            assert.strictEqual(
+              location1.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location1.range.start.line,
+              6,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location1.range.start.character,
+              26,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location2 = locations[1];
+            assert.strictEqual(
+              location2.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location2.range.start.line,
+              44,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location2.range.start.character,
+              3,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+            let location3 = locations[2];
+            assert.strictEqual(
+              location3.uri.toString(),
+              uri.toString(),
+              "vscode.executeReferenceProvider provided incorrect uri"
+            );
+            assert.strictEqual(
+              location3.range.start.line,
+              45,
+              "vscode.executeReferenceProvider provided incorrect line"
+            );
+            assert.strictEqual(
+              location3.range.start.character,
+              14,
+              "vscode.executeReferenceProvider provided incorrect character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute reference provider: " + uri);
+          }
+        );
+    });
+  });
 });
 
-suite("code action provider: generate event listener : Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeCodeActionProvider finds generate event listener with string literal and no metadata", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateEventListener.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(13, 61);
-			let end = new vscode.Position(13, 61);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Event Listener";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\t\tprivate function literalWithoutMetadataListener(event:Object):void\n\t\t{\n\t\t}\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 25, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 25, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds generate event listener with string literal and metadata with missing class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateEventListener.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(14, 81);
-			let end = new vscode.Position(14, 81);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Event Listener";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\t\tprivate function literalWithMetadataButMissingMetadataClassListener(event:Object):void\n\t\t{\n\t\t}\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 25, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 25, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds generate event listener with string literal and full metadata", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateEventListener.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(15, 66);
-			let end = new vscode.Position(15, 66);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Event Listener";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\t\tprivate function literalWithMetadataAndClassListener(event:GenerateEventEvent):void\n\t\t{\n\t\t}\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 25, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 25, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds generate event listener with constant and no metadata", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateEventListener.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(16, 81);
-			let end = new vscode.Position(16, 81);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Event Listener";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\t\tprivate function constantWithoutMetadataListener(event:Object):void\n\t\t{\n\t\t}\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 25, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 25, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds generate event listener with constant and metadata with missing class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateEventListener.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(17, 105);
-			let end = new vscode.Position(17, 105);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Event Listener";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\t\tprivate function constantWithMetadataButMissingMetadataClassListener(event:Object):void\n\t\t{\n\t\t}\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 25, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 25, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds generate event listener with constant and full metadata", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateEventListener.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(18, 88);
-			let end = new vscode.Position(18, 88);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Event Listener";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\t\tprivate function constantWithMetadataAndClassListener(event:GenerateEventEvent):void\n\t\t{\n\t\t}\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 25, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 25, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds generate event listener with explicit this member access on addEventListener", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateEventListener.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(19, 82);
-			let end = new vscode.Position(19, 82);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Event Listener";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\t\tprivate function explicitThisListener(event:GenerateEventEvent):void\n\t\t{\n\t\t}\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 25, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 25, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds generate event listener with implement this member access on addEventListener", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateEventListener.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(20, 77);
-			let end = new vscode.Position(20, 77);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Event Listener";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\t\tprivate function implicitThisListener(event:GenerateEventEvent):void\n\t\t{\n\t\t}\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 25, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 25, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds generate event listener with member access before listener name", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateEventListener.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(21, 93);
-			let end = new vscode.Position(21, 93);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Event Listener";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\t\tprivate function listenerWithMemberAccess(event:GenerateEventEvent):void\n\t\t{\n\t\t}\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 25, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 25, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider omits generate event listener with non-this member access before listener name", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateEventListener.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(22, 99);
-			let end = new vscode.Position(22, 99);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Event Listener";
-						});
-						assert.strictEqual(codeAction, undefined, "Code action must not be found");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider omits generate event listener with function that already exists", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateEventListener.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(23, 88);
-			let end = new vscode.Position(23, 88);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Event Listener";
-						});
-						assert.strictEqual(codeAction, undefined, "Code action must not be found");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeCodeActionProvider finds generate event listener in file-internal class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "GenerateEventListener.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(36, 87);
-			let end = new vscode.Position(36, 87);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction) =>
-						{
-							return codeAction.title == "Generate Event Listener";
-						});
-						assert.notEqual(codeAction, undefined, "Code action not found");
-						assert.strictEqual(codeAction.command, undefined, "Code action provided incorrect command");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.QuickFix.value, "Code action provided incorrect kind");
-						let workspaceEdit = codeAction.edit;
-						assert.notEqual(workspaceEdit, undefined, "Code action missing workspace edit");
-						assert.ok(workspaceEdit.has(uri), "Code action workspace edit missing URI: " + uri);
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 1);
-						let textEdit = textEdits[0];
-						assert.strictEqual(textEdit.newText, "\n\tprivate function constantWithMetadataAndClassListener(event:GenerateEventEvent):void\n\t{\n\t}\n", "Code action workspace edit provided incorrect new text");
-						let range = textEdit.range;
-						assert.strictEqual(range.start.line, 38, "Code action workspace edit provided incorrect start line");
-						assert.strictEqual(range.start.character, 0, "Code action workspace edit provided incorrect start character");
-						assert.strictEqual(range.end.line, 38, "Code action workspace edit provided incorrect end line");
-						assert.strictEqual(range.end.character, 0, "Code action workspace edit provided incorrect end character");
-
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
+suite("rename provider: Application workspace", () => {
+  suiteTeardown(revertAndCloseAllEditors);
+  test("vscode.executeDocumentRenameProvider finds edits for local variable from its declaration", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(38, 10);
+    let newText = "newName";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeDocumentRenameProvider",
+          uri,
+          position,
+          newText
+        )
+        .then(
+          (workspaceEdit: vscode.WorkspaceEdit) => {
+            assert.strictEqual(
+              workspaceEdit.size,
+              1,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of uris"
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(
+              textEdits.length,
+              2,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of text edits"
+            );
+            let textEdit1 = textEdits[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.line,
+              38,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.character,
+              7,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.line,
+              38,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.character,
+              15,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit2 = textEdits[1];
+            assert.strictEqual(
+              textEdit2.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.line,
+              86,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.character,
+              3,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.line,
+              86,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.character,
+              11,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute rename provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentRenameProvider finds edits for local variable from assignment that is not initialization", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(86, 5);
+    let newText = "newName";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeDocumentRenameProvider",
+          uri,
+          position,
+          newText
+        )
+        .then(
+          (workspaceEdit: vscode.WorkspaceEdit) => {
+            assert.strictEqual(
+              workspaceEdit.size,
+              1,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of uris"
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(
+              textEdits.length,
+              2,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of text edits"
+            );
+            let textEdit1 = textEdits[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.line,
+              38,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.character,
+              7,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.line,
+              38,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.character,
+              15,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit2 = textEdits[1];
+            assert.strictEqual(
+              textEdit2.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.line,
+              86,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.character,
+              3,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.line,
+              86,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.character,
+              11,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute rename provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentRenameProvider finds edits to local function from its declaration", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(39, 15);
+    let newText = "newName";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeDocumentRenameProvider",
+          uri,
+          position,
+          newText
+        )
+        .then(
+          (workspaceEdit: vscode.WorkspaceEdit) => {
+            assert.strictEqual(
+              workspaceEdit.size,
+              1,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of uris"
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(
+              textEdits.length,
+              2,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of text edits"
+            );
+            let textEdit1 = textEdits[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new name"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.line,
+              39,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.character,
+              12,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.line,
+              39,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.character,
+              25,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit2 = textEdits[1];
+            assert.strictEqual(
+              textEdit2.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new name"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.line,
+              88,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.character,
+              3,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.line,
+              88,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.character,
+              16,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute rename provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentRenameProvider finds edits to local function from call", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(88, 5);
+    let newText = "newName";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeDocumentRenameProvider",
+          uri,
+          position,
+          newText
+        )
+        .then(
+          (workspaceEdit: vscode.WorkspaceEdit) => {
+            assert.strictEqual(
+              workspaceEdit.size,
+              1,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of uris"
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(
+              textEdits.length,
+              2,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of text edits"
+            );
+            let textEdit1 = textEdits[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new name"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.line,
+              39,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.character,
+              12,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.line,
+              39,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.character,
+              25,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit2 = textEdits[1];
+            assert.strictEqual(
+              textEdit2.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new name"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.line,
+              88,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.character,
+              3,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.line,
+              88,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.character,
+              16,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute rename provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentRenameProvider finds edits for member variable from its declaration", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(10, 16);
+    let newText = "newName";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeDocumentRenameProvider",
+          uri,
+          position,
+          newText
+        )
+        .then(
+          (workspaceEdit: vscode.WorkspaceEdit) => {
+            assert.strictEqual(
+              workspaceEdit.size,
+              1,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of uris"
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(
+              textEdits.length,
+              3,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of text edits"
+            );
+            let textEdit1 = textEdits[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.line,
+              10,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.character,
+              14,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.line,
+              10,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.character,
+              23,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit2 = textEdits[1];
+            assert.strictEqual(
+              textEdit2.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.line,
+              50,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.character,
+              3,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.line,
+              50,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.character,
+              12,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit3 = textEdits[2];
+            assert.strictEqual(
+              textEdit3.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.line,
+              51,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.character,
+              8,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.line,
+              51,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.character,
+              17,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute rename provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentRenameProvider finds edits for member variable from assignment without this member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(50, 5);
+    let newText = "newName";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeDocumentRenameProvider",
+          uri,
+          position,
+          newText
+        )
+        .then(
+          (workspaceEdit: vscode.WorkspaceEdit) => {
+            assert.strictEqual(
+              workspaceEdit.size,
+              1,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of uris"
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(
+              textEdits.length,
+              3,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of text edits"
+            );
+            let textEdit1 = textEdits[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.line,
+              10,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.character,
+              14,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.line,
+              10,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.character,
+              23,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit2 = textEdits[1];
+            assert.strictEqual(
+              textEdit2.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.line,
+              50,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.character,
+              3,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.line,
+              50,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.character,
+              12,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit3 = textEdits[2];
+            assert.strictEqual(
+              textEdit3.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.line,
+              51,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.character,
+              8,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.line,
+              51,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.character,
+              17,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute rename provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentRenameProvider finds edits for member variable from assignment with this member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(51, 10);
+    let newText = "newName";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeDocumentRenameProvider",
+          uri,
+          position,
+          newText
+        )
+        .then(
+          (workspaceEdit: vscode.WorkspaceEdit) => {
+            assert.strictEqual(
+              workspaceEdit.size,
+              1,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of uris"
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(
+              textEdits.length,
+              3,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of text edits"
+            );
+            let textEdit1 = textEdits[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.line,
+              10,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.character,
+              14,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.line,
+              10,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.character,
+              23,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit2 = textEdits[1];
+            assert.strictEqual(
+              textEdit2.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.line,
+              50,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.character,
+              3,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.line,
+              50,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.character,
+              12,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit3 = textEdits[2];
+            assert.strictEqual(
+              textEdit3.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.line,
+              51,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.character,
+              8,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.line,
+              51,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.character,
+              17,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute rename provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentRenameProvider finds edits for member function from its declaration", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(12, 22);
+    let newText = "newName";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeDocumentRenameProvider",
+          uri,
+          position,
+          newText
+        )
+        .then(
+          (workspaceEdit: vscode.WorkspaceEdit) => {
+            assert.strictEqual(
+              workspaceEdit.size,
+              1,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of uris"
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(
+              textEdits.length,
+              3,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of text edits"
+            );
+            let textEdit1 = textEdits[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.line,
+              12,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.character,
+              19,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.line,
+              12,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.character,
+              33,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit2 = textEdits[1];
+            assert.strictEqual(
+              textEdit2.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.line,
+              41,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.character,
+              3,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.line,
+              41,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.character,
+              17,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit3 = textEdits[2];
+            assert.strictEqual(
+              textEdit3.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.line,
+              42,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.character,
+              8,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.line,
+              42,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.character,
+              22,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute rename provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentRenameProvider finds edits for member function from a call without this member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(41, 5);
+    let newText = "newName";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeDocumentRenameProvider",
+          uri,
+          position,
+          newText
+        )
+        .then(
+          (workspaceEdit: vscode.WorkspaceEdit) => {
+            assert.strictEqual(
+              workspaceEdit.size,
+              1,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of uris"
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(
+              textEdits.length,
+              3,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of text edits"
+            );
+            let textEdit1 = textEdits[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.line,
+              12,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.character,
+              19,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.line,
+              12,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.character,
+              33,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit2 = textEdits[1];
+            assert.strictEqual(
+              textEdit2.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.line,
+              41,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.character,
+              3,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.line,
+              41,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.character,
+              17,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit3 = textEdits[2];
+            assert.strictEqual(
+              textEdit3.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.line,
+              42,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.character,
+              8,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.line,
+              42,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.character,
+              22,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute rename provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentRenameProvider finds edits for member function from a call with this member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(42, 10);
+    let newText = "newName";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeDocumentRenameProvider",
+          uri,
+          position,
+          newText
+        )
+        .then(
+          (workspaceEdit: vscode.WorkspaceEdit) => {
+            assert.strictEqual(
+              workspaceEdit.size,
+              1,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of uris"
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(
+              textEdits.length,
+              3,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of text edits"
+            );
+            let textEdit1 = textEdits[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.line,
+              12,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.character,
+              19,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.line,
+              12,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.character,
+              33,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit2 = textEdits[1];
+            assert.strictEqual(
+              textEdit2.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.line,
+              41,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.character,
+              3,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.line,
+              41,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.character,
+              17,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit3 = textEdits[2];
+            assert.strictEqual(
+              textEdit3.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.line,
+              42,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.character,
+              8,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.line,
+              42,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.character,
+              22,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute rename provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentRenameProvider finds edits for static variable from its declaration", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(4, 22);
+    let newText = "newName";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeDocumentRenameProvider",
+          uri,
+          position,
+          newText
+        )
+        .then(
+          (workspaceEdit: vscode.WorkspaceEdit) => {
+            assert.strictEqual(
+              workspaceEdit.size,
+              1,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of uris"
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(
+              textEdits.length,
+              3,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of text edits"
+            );
+            let textEdit1 = textEdits[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.line,
+              4,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.character,
+              20,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.line,
+              4,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.character,
+              29,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit2 = textEdits[1];
+            assert.strictEqual(
+              textEdit2.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.line,
+              47,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.character,
+              3,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.line,
+              47,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.character,
+              12,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit3 = textEdits[2];
+            assert.strictEqual(
+              textEdit3.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.line,
+              48,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.character,
+              14,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.line,
+              48,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.character,
+              23,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute rename provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentRenameProvider finds edits for static variable from assignment without type member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(47, 5);
+    let newText = "newName";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeDocumentRenameProvider",
+          uri,
+          position,
+          newText
+        )
+        .then(
+          (workspaceEdit: vscode.WorkspaceEdit) => {
+            assert.strictEqual(
+              workspaceEdit.size,
+              1,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of uris"
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(
+              textEdits.length,
+              3,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of text edits"
+            );
+            let textEdit1 = textEdits[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.line,
+              4,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.character,
+              20,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.line,
+              4,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.character,
+              29,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit2 = textEdits[1];
+            assert.strictEqual(
+              textEdit2.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.line,
+              47,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.character,
+              3,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.line,
+              47,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.character,
+              12,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit3 = textEdits[2];
+            assert.strictEqual(
+              textEdit3.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.line,
+              48,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.character,
+              14,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.line,
+              48,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.character,
+              23,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute rename provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentRenameProvider finds edits for static variable from assignment with type member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(48, 16);
+    let newText = "newName";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeDocumentRenameProvider",
+          uri,
+          position,
+          newText
+        )
+        .then(
+          (workspaceEdit: vscode.WorkspaceEdit) => {
+            assert.strictEqual(
+              workspaceEdit.size,
+              1,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of uris"
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(
+              textEdits.length,
+              3,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of text edits"
+            );
+            let textEdit1 = textEdits[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.line,
+              4,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.character,
+              20,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.line,
+              4,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.character,
+              29,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit2 = textEdits[1];
+            assert.strictEqual(
+              textEdit2.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.line,
+              47,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.character,
+              3,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.line,
+              47,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.character,
+              12,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit3 = textEdits[2];
+            assert.strictEqual(
+              textEdit3.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.line,
+              48,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.character,
+              14,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.line,
+              48,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.character,
+              23,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute rename provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentRenameProvider finds edits for static function from its declaration", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(6, 28);
+    let newText = "newName";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeDocumentRenameProvider",
+          uri,
+          position,
+          newText
+        )
+        .then(
+          (workspaceEdit: vscode.WorkspaceEdit) => {
+            assert.strictEqual(
+              workspaceEdit.size,
+              1,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of uris"
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(
+              textEdits.length,
+              3,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of text edits"
+            );
+            let textEdit1 = textEdits[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.line,
+              6,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.character,
+              26,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.line,
+              6,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.character,
+              40,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit2 = textEdits[1];
+            assert.strictEqual(
+              textEdit2.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.line,
+              44,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.character,
+              3,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.line,
+              44,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.character,
+              17,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit3 = textEdits[2];
+            assert.strictEqual(
+              textEdit3.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.line,
+              45,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.character,
+              14,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.line,
+              45,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.character,
+              28,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute rename provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentRenameProvider finds edits for static function from call without type member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(44, 5);
+    let newText = "newName";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeDocumentRenameProvider",
+          uri,
+          position,
+          newText
+        )
+        .then(
+          (workspaceEdit: vscode.WorkspaceEdit) => {
+            assert.strictEqual(
+              workspaceEdit.size,
+              1,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of uris"
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(
+              textEdits.length,
+              3,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of text edits"
+            );
+            let textEdit1 = textEdits[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.line,
+              6,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.character,
+              26,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.line,
+              6,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.character,
+              40,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit2 = textEdits[1];
+            assert.strictEqual(
+              textEdit2.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.line,
+              44,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.character,
+              3,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.line,
+              44,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.character,
+              17,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit3 = textEdits[2];
+            assert.strictEqual(
+              textEdit3.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.line,
+              45,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.character,
+              14,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.line,
+              45,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.character,
+              28,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute rename provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentRenameProvider finds edits for static function from call with type member access", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "references",
+        "References.as"
+      )
+    );
+    let position = new vscode.Position(45, 16);
+    let newText = "newName";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand(
+          "vscode.executeDocumentRenameProvider",
+          uri,
+          position,
+          newText
+        )
+        .then(
+          (workspaceEdit: vscode.WorkspaceEdit) => {
+            assert.strictEqual(
+              workspaceEdit.size,
+              1,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of uris"
+            );
+            let textEdits = workspaceEdit.get(uri);
+            assert.strictEqual(
+              textEdits.length,
+              3,
+              "vscode.executeDocumentRenameProvider failed to provide correct number of text edits"
+            );
+            let textEdit1 = textEdits[0];
+            assert.strictEqual(
+              textEdit1.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.line,
+              6,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit1.range.start.character,
+              26,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.line,
+              6,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit1.range.end.character,
+              40,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit2 = textEdits[1];
+            assert.strictEqual(
+              textEdit2.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.line,
+              44,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit2.range.start.character,
+              3,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.line,
+              44,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit2.range.end.character,
+              17,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+            let textEdit3 = textEdits[2];
+            assert.strictEqual(
+              textEdit3.newText,
+              newText,
+              "vscode.executeDocumentRenameProvider provided incorrect new text"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.line,
+              45,
+              "vscode.executeDocumentRenameProvider provided incorrect start line"
+            );
+            assert.strictEqual(
+              textEdit3.range.start.character,
+              14,
+              "vscode.executeDocumentRenameProvider provided incorrect start character"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.line,
+              45,
+              "vscode.executeDocumentRenameProvider provided incorrect end line"
+            );
+            assert.strictEqual(
+              textEdit3.range.end.character,
+              28,
+              "vscode.executeDocumentRenameProvider provided incorrect end character"
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute rename provider: " + uri);
+          }
+        );
+    });
+  });
 });
 
-suite("organize imports: Application workspace", () =>
-{
-	teardown(revertAndCloseActiveEditor);
-	test("vscode.executeCodeActionProvider finds organize imports", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "OrganizeImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			let start = new vscode.Position(2, 45);
-			let end = new vscode.Position(2, 45);
-			let range = new vscode.Range(start, end);
-			return vscode.commands.executeCommand("vscode.executeCodeActionProvider", uri, range)
-				.then((codeActions: vscode.CodeAction[]) =>
-					{
-						let codeAction = codeActions.find((codeAction: vscode.CodeAction) =>
-						{
-							return codeAction.kind.value === vscode.CodeActionKind.SourceOrganizeImports.value;
-						});
-						assert.notEqual(codeAction, null, "Code action not found");
-						assert.strictEqual(codeAction.title, "Organize Imports", "Code action provided incorrect title");
-						assert.strictEqual(codeAction.kind.value, vscode.CodeActionKind.SourceOrganizeImports.value, "Code action provided incorrect kind");
-						let command = codeAction.command;
-						assert.notEqual(command, null, "Code action command not found");
-						assert.strictEqual(command.command, COMMAND_ORGANIZE_IMPORTS_IN_URI, "Code action provided incorrect command");
-						assert.strictEqual(command.title, "Organize Imports", "Code action provided incorrect command title");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute code actions provider: " + uri);
-					});
-		});
-	});
-	test("as3mxml.organizeImportsInUri organizes imports in ActionScript: removes unused imports, adds missing imports, and reorganizes remaining imports in alphabetical order", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "OrganizeImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand(COMMAND_ORGANIZE_IMPORTS_IN_URI, uri)
-				.then(() =>
-					{
-						return new Promise((resolve, reject) =>
-						{
-							//the text edit is not applied immediately, so give
-							//it a short delay before we check
-							setTimeout(() =>
-							{
-								let start = new vscode.Position(2, 0);
-								let end = new vscode.Position(12, 0);
-								let range = new vscode.Range(start, end);
-								let generatedText = editor.document.getText(range);
-								assert.strictEqual(generatedText,
-									"\timport com.example.organizeImports.ImportToAdd;\n\timport com.example.organizeImports.ImportToAddFromAsOperator;\n\timport com.example.organizeImports.ImportToAddFromCast;\n\timport com.example.organizeImports.ImportToAddFromIsOperator;\n\timport com.example.organizeImports.ImportToAddFromNew;\n\timport com.example.organizeImports.ImportToAddFromReturnType;\n\timport com.example.organizeImports.ImportToKeepClass;\n\timport com.example.organizeImports.ImportToKeepInterface;\n\timport com.example.organizeImports.wildcards.*;\n\n",
-									"as3mxml.organizeImportsInUri failed to organize imports");
-								resolve();
-							}, 1000);
-						})
-					}, (err) =>
-					{
-						assert(false, "Failed to execute organize imports command: " + uri);
-					});
-		});
-	});
-	test("as3mxml.organizeImportsInUri organizes imports in MXML: removes unused imports, adds missing imports, and reorganizes remaining imports in alphabetical order", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "MXMLOrganizeImports.mxml"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand(COMMAND_ORGANIZE_IMPORTS_IN_URI, uri)
-				.then(() =>
-					{
-						return new Promise((resolve, reject) =>
-						{
-							//the text edit is not applied immediately, so give
-							//it a short delay before we check
-							setTimeout(() =>
-							{
-								let start = new vscode.Position(5, 0);
-								let end = new vscode.Position(15, 0);
-								let range = new vscode.Range(start, end);
-								let generatedText = editor.document.getText(range);
-								assert.strictEqual(generatedText,
-									"\t\t\timport com.example.organizeImports.ImportToAdd;\n\t\t\timport com.example.organizeImports.ImportToAddFromAsOperator;\n\t\t\timport com.example.organizeImports.ImportToAddFromCast;\n\t\t\timport com.example.organizeImports.ImportToAddFromIsOperator;\n\t\t\timport com.example.organizeImports.ImportToAddFromNew;\n\t\t\timport com.example.organizeImports.ImportToAddFromReturnType;\n\t\t\timport com.example.organizeImports.ImportToKeepClass;\n\t\t\timport com.example.organizeImports.ImportToKeepInterface;\n\t\t\timport com.example.organizeImports.wildcards.*;\n\n",
-									"as3mxml.organizeImportsInUri failed to organize imports");
-								resolve();
-							}, 1000);
-						})
-					}, (err) =>
-					{
-						assert(false, "Failed to execute organize imports command: " + uri);
-					});
-		});
-	});
-	//BowlerHatLLC/vscode-as3mxml#182
-	test("as3mxml.organizeImportsInUri must be able to remove all imports, if necessary", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "RemoveAllImports.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand(COMMAND_ORGANIZE_IMPORTS_IN_URI, uri)
-				.then(() =>
-					{
-						return new Promise((resolve, reject) =>
-						{
-							//the text edit is not applied immediately, so give
-							//it a short delay before we check
-							setTimeout(() =>
-							{
-								let start = new vscode.Position(2, 0);
-								let end = new vscode.Position(3, 0);
-								let range = new vscode.Range(start, end);
-								let generatedText = editor.document.getText(range);
-								assert.strictEqual(generatedText, "\n", "as3mxml.organizeImportsInUri failed to organize imports");
-								resolve();
-							}, 1000);
-						})
-					}, (err) =>
-					{
-						assert(false, "Failed to execute organize imports command: " + uri);
-					});
-		});
-	});
+suite("document symbol provider: Library workspace", () => {
+  suiteTeardown(revertAndCloseAllEditors);
+  test("vscode.executeDocumentSymbolProvider not empty", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[1].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "LibraryDocumentSymbols.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDocumentSymbolProvider", uri)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.notStrictEqual(
+              symbols.length,
+              0,
+              "vscode.executeDocumentSymbolProvider failed to provide symbols in text document: " +
+                uri
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute document symbol provider: " + uri);
+          }
+        );
+    });
+  });
+  test("vscode.executeDocumentSymbolProvider includes class", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[1].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "LibraryDocumentSymbols.as"
+      )
+    );
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeDocumentSymbolProvider", uri)
+        .then(
+          (symbols: vscode.DocumentSymbol[]) => {
+            let className = "LibraryDocumentSymbols";
+            assert.ok(
+              findDocumentSymbol(
+                symbols,
+                new vscode.DocumentSymbol(
+                  className,
+                  null,
+                  vscode.SymbolKind.Class,
+                  createRange(2, 14),
+                  createRange(2, 14)
+                )
+              ),
+              "vscode.executeDocumentSymbolProvider failed to provide symbol for class: " +
+                className
+            );
+          },
+          (err) => {
+            assert(false, "Failed to execute document symbol provider: " + uri);
+          }
+        );
+    });
+  });
 });
 
-suite("includes: application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeDefinitionProvider finds definition of method before include statement", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "includes", "Includes.as"));
-		let position = new vscode.Position(4, 20);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of local variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for definition");
-						assert.strictEqual(location.range.start.line, 4, "vscode.executeDefinitionProvider provided incorrect line for definition");
-						assert.strictEqual(location.range.start.character, 18, "vscode.executeDefinitionProvider provided incorrect character for definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of method between include statements", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "includes", "Includes.as"));
-		let position = new vscode.Position(8, 20);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of local variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for definition");
-						assert.strictEqual(location.range.start.line, 8, "vscode.executeDefinitionProvider provided incorrect line for definition");
-						assert.strictEqual(location.range.start.character, 18, "vscode.executeDefinitionProvider provided incorrect character for definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of method after include statements", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "includes", "Includes.as"));
-		let position = new vscode.Position(12, 20);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of local variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for definition");
-						assert.strictEqual(location.range.start.line, 12, "vscode.executeDefinitionProvider provided incorrect line for definition");
-						assert.strictEqual(location.range.start.character, 18, "vscode.executeDefinitionProvider provided incorrect character for definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of method in first file included with include statement", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "includes", "scripts", "include1.as"));
-		let position = new vscode.Position(0, 18);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of local variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for definition");
-						assert.strictEqual(location.range.start.line, 0, "vscode.executeDefinitionProvider provided incorrect line for definition");
-						assert.strictEqual(location.range.start.character, 16, "vscode.executeDefinitionProvider provided incorrect character for definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of method in second file included with include statement", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "includes", "scripts", "include2.as"))
-		let position = new vscode.Position(1, 18);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of local variable definition: " + uri);
-						let location = locations[0];
-						assert.strictEqual(location.uri.toString(), uri.toString(), "vscode.executeDefinitionProvider provided incorrect uri for definition");
-						assert.strictEqual(location.range.start.line, 1, "vscode.executeDefinitionProvider provided incorrect line for definition");
-						assert.strictEqual(location.range.start.character, 16, "vscode.executeDefinitionProvider provided incorrect character for definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of method in one included file from another included file", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "includes", "scripts", "include2.as"));
-		let position = new vscode.Position(3, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of local variable definition: " + uri);
-						let location = locations[0];
-						let expectedURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "includes", "scripts", "include1.as"));
-						assert.strictEqual(location.uri.toString(), expectedURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for definition");
-						assert.strictEqual(location.range.start.line, 0, "vscode.executeDefinitionProvider provided incorrect line for definition");
-						assert.strictEqual(location.range.start.character, 16, "vscode.executeDefinitionProvider provided incorrect character for definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of method in main file from an included file", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "includes", "scripts", "include1.as"));
-		let position = new vscode.Position(2, 3);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of local variable definition: " + uri);
-						let location = locations[0];
-						let expectedURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "includes", "Includes.as"))
-						assert.strictEqual(location.uri.toString(), expectedURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for definition");
-						assert.strictEqual(location.range.start.line, 12, "vscode.executeDefinitionProvider provided incorrect line for definition");
-						assert.strictEqual(location.range.start.character, 18, "vscode.executeDefinitionProvider provided incorrect character for definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDefinitionProvider finds definition of method in included file from main file", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "includes", "Includes.as"));
-		let position = new vscode.Position(14, 4);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDefinitionProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 1,
-							"vscode.executeDefinitionProvider failed to provide location of local variable definition: " + uri);
-						let location = locations[0];
-						let expectedURI = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "includes", "scripts", "include1.as"));
-						assert.strictEqual(location.uri.toString(), expectedURI.toString(), "vscode.executeDefinitionProvider provided incorrect uri for definition");
-						assert.strictEqual(location.range.start.line, 0, "vscode.executeDefinitionProvider provided incorrect line for definition");
-						assert.strictEqual(location.range.start.character, 16, "vscode.executeDefinitionProvider provided incorrect character for definition");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute definition provider: " + uri);
-					});
-		});
-	});
-});
+suite("workspace symbol provider: multiple workspaces", () => {
+  suiteTeardown(revertAndCloseAllEditors);
+  test("vscode.executeWorkspaceSymbolProvider includes classes from all workspaces", () => {
+    let uri = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "Main.as"
+      )
+    );
 
-suite("reference provider: Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeReferenceProvider finds references to local variable from its declaration", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(38, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeReferenceProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 2,
-							"vscode.executeReferenceProvider failed to provide locations: " + uri);
-						let location1 = locations[0];
-						assert.strictEqual(location1.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location1.range.start.line, 38, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location1.range.start.character, 7, "vscode.executeReferenceProvider provided incorrect character");
-						let location2 = locations[1];
-						assert.strictEqual(location2.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location2.range.start.line, 86, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location2.range.start.character, 3, "vscode.executeReferenceProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute reference provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeReferenceProvider finds references to local variable from assignment that is not initialization", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(86, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeReferenceProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 2,
-							"vscode.executeReferenceProvider failed to provide locations: " + uri);
-						let location1 = locations[0];
-						assert.strictEqual(location1.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location1.range.start.line, 38, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location1.range.start.character, 7, "vscode.executeReferenceProvider provided incorrect character");
-						let location2 = locations[1];
-						assert.strictEqual(location2.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location2.range.start.line, 86, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location2.range.start.character, 3, "vscode.executeReferenceProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute reference provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeReferenceProvider finds references to local function from its declaration", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(39, 15);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeReferenceProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 2,
-							"vscode.executeReferenceProvider failed to provide locations: " + uri);
-						let location1 = locations[0];
-						assert.strictEqual(location1.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location1.range.start.line, 39, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location1.range.start.character, 12, "vscode.executeReferenceProvider provided incorrect character");
-						let location2 = locations[1];
-						assert.strictEqual(location2.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location2.range.start.line, 88, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location2.range.start.character, 3, "vscode.executeReferenceProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute reference provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeReferenceProvider finds references to local function from a call", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(88, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeReferenceProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 2,
-							"vscode.executeReferenceProvider failed to provide locations: " + uri);
-						let location1 = locations[0];
-						assert.strictEqual(location1.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location1.range.start.line, 39, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location1.range.start.character, 12, "vscode.executeReferenceProvider provided incorrect character");
-						let location2 = locations[1];
-						assert.strictEqual(location2.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location2.range.start.line, 88, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location2.range.start.character, 3, "vscode.executeReferenceProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute reference provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeReferenceProvider finds references to member variable from its declaration", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(10, 16);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeReferenceProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 3,
-							"vscode.executeReferenceProvider failed to provide locations: " + uri);
-						let location1 = locations[0];
-						assert.strictEqual(location1.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location1.range.start.line, 10, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location1.range.start.character, 14, "vscode.executeReferenceProvider provided incorrect character");
-						let location2 = locations[1];
-						assert.strictEqual(location2.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location2.range.start.line, 50, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location2.range.start.character, 3, "vscode.executeReferenceProvider provided incorrect character");
-						let location3 = locations[2];
-						assert.strictEqual(location3.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location3.range.start.line, 51, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location3.range.start.character, 8, "vscode.executeReferenceProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute reference provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeReferenceProvider finds references to member variable from assignment without this member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(50, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeReferenceProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 3,
-							"vscode.executeReferenceProvider failed to provide locations: " + uri);
-						let location1 = locations[0];
-						assert.strictEqual(location1.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location1.range.start.line, 10, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location1.range.start.character, 14, "vscode.executeReferenceProvider provided incorrect character");
-						let location2 = locations[1];
-						assert.strictEqual(location2.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location2.range.start.line, 50, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location2.range.start.character, 3, "vscode.executeReferenceProvider provided incorrect character");
-						let location3 = locations[2];
-						assert.strictEqual(location3.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location3.range.start.line, 51, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location3.range.start.character, 8, "vscode.executeReferenceProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute reference provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeReferenceProvider finds references to member variable from assignment with this member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(51, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeReferenceProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 3,
-							"vscode.executeReferenceProvider failed to provide locations: " + uri);
-						let location1 = locations[0];
-						assert.strictEqual(location1.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location1.range.start.line, 10, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location1.range.start.character, 14, "vscode.executeReferenceProvider provided incorrect character");
-						let location2 = locations[1];
-						assert.strictEqual(location2.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location2.range.start.line, 50, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location2.range.start.character, 3, "vscode.executeReferenceProvider provided incorrect character");
-						let location3 = locations[2];
-						assert.strictEqual(location3.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location3.range.start.line, 51, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location3.range.start.character, 8, "vscode.executeReferenceProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute reference provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeReferenceProvider finds references to member function from its declaration", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(12, 22);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeReferenceProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 3,
-							"vscode.executeReferenceProvider failed to provide locations: " + uri);
-						let location1 = locations[0];
-						assert.strictEqual(location1.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location1.range.start.line, 12, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location1.range.start.character, 19, "vscode.executeReferenceProvider provided incorrect character");
-						let location2 = locations[1];
-						assert.strictEqual(location2.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location2.range.start.line, 41, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location2.range.start.character, 3, "vscode.executeReferenceProvider provided incorrect character");
-						let location3 = locations[2];
-						assert.strictEqual(location3.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location3.range.start.line, 42, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location3.range.start.character, 8, "vscode.executeReferenceProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute reference provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeReferenceProvider finds references to member function from call without this member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(41, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeReferenceProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 3,
-							"vscode.executeReferenceProvider failed to provide locations: " + uri);
-						let location1 = locations[0];
-						assert.strictEqual(location1.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location1.range.start.line, 12, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location1.range.start.character, 19, "vscode.executeReferenceProvider provided incorrect character");
-						let location2 = locations[1];
-						assert.strictEqual(location2.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location2.range.start.line, 41, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location2.range.start.character, 3, "vscode.executeReferenceProvider provided incorrect character");
-						let location3 = locations[2];
-						assert.strictEqual(location3.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location3.range.start.line, 42, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location3.range.start.character, 8, "vscode.executeReferenceProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute reference provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeReferenceProvider finds references to member function from call with this member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(42, 10);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeReferenceProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 3,
-							"vscode.executeReferenceProvider failed to provide locations: " + uri);
-						let location1 = locations[0];
-						assert.strictEqual(location1.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location1.range.start.line, 12, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location1.range.start.character, 19, "vscode.executeReferenceProvider provided incorrect character");
-						let location2 = locations[1];
-						assert.strictEqual(location2.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location2.range.start.line, 41, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location2.range.start.character, 3, "vscode.executeReferenceProvider provided incorrect character");
-						let location3 = locations[2];
-						assert.strictEqual(location3.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location3.range.start.line, 42, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location3.range.start.character, 8, "vscode.executeReferenceProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute reference provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeReferenceProvider finds references to static variable from its declaration", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(4, 22);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeReferenceProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 3,
-							"vscode.executeReferenceProvider failed to provide locations: " + uri);
-						let location1 = locations[0];
-						assert.strictEqual(location1.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location1.range.start.line, 4, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location1.range.start.character, 20, "vscode.executeReferenceProvider provided incorrect character");
-						let location2 = locations[1];
-						assert.strictEqual(location2.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location2.range.start.line, 47, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location2.range.start.character, 3, "vscode.executeReferenceProvider provided incorrect character");
-						let location3 = locations[2];
-						assert.strictEqual(location3.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location3.range.start.line, 48, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location3.range.start.character, 14, "vscode.executeReferenceProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute reference provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeReferenceProvider finds references to static variable from assignment without type member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(47, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeReferenceProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 3,
-							"vscode.executeReferenceProvider failed to provide locations: " + uri);
-						let location1 = locations[0];
-						assert.strictEqual(location1.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location1.range.start.line, 4, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location1.range.start.character, 20, "vscode.executeReferenceProvider provided incorrect character");
-						let location2 = locations[1];
-						assert.strictEqual(location2.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location2.range.start.line, 47, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location2.range.start.character, 3, "vscode.executeReferenceProvider provided incorrect character");
-						let location3 = locations[2];
-						assert.strictEqual(location3.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location3.range.start.line, 48, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location3.range.start.character, 14, "vscode.executeReferenceProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute reference provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeReferenceProvider finds references to static variable from assignment with type member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(48, 16);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeReferenceProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 3,
-							"vscode.executeReferenceProvider failed to provide locations: " + uri);
-						let location1 = locations[0];
-						assert.strictEqual(location1.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location1.range.start.line, 4, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location1.range.start.character, 20, "vscode.executeReferenceProvider provided incorrect character");
-						let location2 = locations[1];
-						assert.strictEqual(location2.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location2.range.start.line, 47, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location2.range.start.character, 3, "vscode.executeReferenceProvider provided incorrect character");
-						let location3 = locations[2];
-						assert.strictEqual(location3.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location3.range.start.line, 48, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location3.range.start.character, 14, "vscode.executeReferenceProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute reference provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeReferenceProvider finds references to static function from its declaration", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(6, 28);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeReferenceProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 3,
-							"vscode.executeReferenceProvider failed to provide locations: " + uri);
-						let location1 = locations[0];
-						assert.strictEqual(location1.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location1.range.start.line, 6, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location1.range.start.character, 26, "vscode.executeReferenceProvider provided incorrect character");
-						let location2 = locations[1];
-						assert.strictEqual(location2.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location2.range.start.line, 44, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location2.range.start.character, 3, "vscode.executeReferenceProvider provided incorrect character");
-						let location3 = locations[2];
-						assert.strictEqual(location3.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location3.range.start.line, 45, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location3.range.start.character, 14, "vscode.executeReferenceProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute reference provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeReferenceProvider finds references to static function from call without type member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(44, 5);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeReferenceProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 3,
-							"vscode.executeReferenceProvider failed to provide locations: " + uri);
-						let location1 = locations[0];
-						assert.strictEqual(location1.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location1.range.start.line, 6, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location1.range.start.character, 26, "vscode.executeReferenceProvider provided incorrect character");
-						let location2 = locations[1];
-						assert.strictEqual(location2.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location2.range.start.line, 44, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location2.range.start.character, 3, "vscode.executeReferenceProvider provided incorrect character");
-						let location3 = locations[2];
-						assert.strictEqual(location3.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location3.range.start.line, 45, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location3.range.start.character, 14, "vscode.executeReferenceProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute reference provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeReferenceProvider finds references to static function from call with type member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(45, 16);
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeReferenceProvider", uri, position)
-				.then((locations: vscode.Location[]) =>
-					{
-						assert.strictEqual(locations.length, 3,
-							"vscode.executeReferenceProvider failed to provide locations: " + uri);
-						let location1 = locations[0];
-						assert.strictEqual(location1.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location1.range.start.line, 6, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location1.range.start.character, 26, "vscode.executeReferenceProvider provided incorrect character");
-						let location2 = locations[1];
-						assert.strictEqual(location2.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location2.range.start.line, 44, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location2.range.start.character, 3, "vscode.executeReferenceProvider provided incorrect character");
-						let location3 = locations[2];
-						assert.strictEqual(location3.uri.toString(), uri.toString(), "vscode.executeReferenceProvider provided incorrect uri");
-						assert.strictEqual(location3.range.start.line, 45, "vscode.executeReferenceProvider provided incorrect line");
-						assert.strictEqual(location3.range.start.character, 14, "vscode.executeReferenceProvider provided incorrect character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute reference provider: " + uri);
-					});
-		});
-	});
-});
+    let packageName = "com.example.workspaceSymbols";
+    let uri1 = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[0].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "workspaceSymbols",
+        "WSFindMe1.as"
+      )
+    );
+    let className1 = "WSFindMe1";
+    let uri2 = vscode.Uri.file(
+      path.join(
+        vscode.workspace.workspaceFolders[1].uri.fsPath,
+        "src",
+        "com",
+        "example",
+        "workspaceSymbols",
+        "WSFindMe2.as"
+      )
+    );
+    let className2 = "WSFindMe2";
 
-suite("rename provider: Application workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeDocumentRenameProvider finds edits for local variable from its declaration", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(38, 10);
-		let newText = "newName";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentRenameProvider", uri, position, newText)
-				.then((workspaceEdit: vscode.WorkspaceEdit) =>
-					{
-						assert.strictEqual(workspaceEdit.size, 1,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of uris");
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 2,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of text edits");
-						let textEdit1 = textEdits[0];
-						assert.strictEqual(textEdit1.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit1.range.start.line, 38, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit1.range.start.character, 7, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit1.range.end.line, 38, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit1.range.end.character, 15, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit2 = textEdits[1];
-						assert.strictEqual(textEdit2.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit2.range.start.line, 86, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit2.range.start.character, 3, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit2.range.end.line, 86, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit2.range.end.character, 11, "vscode.executeDocumentRenameProvider provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute rename provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentRenameProvider finds edits for local variable from assignment that is not initialization", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(86, 5);
-		let newText = "newName";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentRenameProvider", uri, position, newText)
-				.then((workspaceEdit: vscode.WorkspaceEdit) =>
-					{
-						assert.strictEqual(workspaceEdit.size, 1,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of uris");
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 2,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of text edits");
-						let textEdit1 = textEdits[0];
-						assert.strictEqual(textEdit1.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit1.range.start.line, 38, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit1.range.start.character, 7, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit1.range.end.line, 38, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit1.range.end.character, 15, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit2 = textEdits[1];
-						assert.strictEqual(textEdit2.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit2.range.start.line, 86, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit2.range.start.character, 3, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit2.range.end.line, 86, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit2.range.end.character, 11, "vscode.executeDocumentRenameProvider provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute rename provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentRenameProvider finds edits to local function from its declaration", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(39, 15);
-		let newText = "newName";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentRenameProvider", uri, position, newText)
-				.then((workspaceEdit: vscode.WorkspaceEdit) =>
-					{
-						assert.strictEqual(workspaceEdit.size, 1,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of uris");
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 2,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of text edits");
-						let textEdit1 = textEdits[0];
-						assert.strictEqual(textEdit1.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new name");
-						assert.strictEqual(textEdit1.range.start.line, 39, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit1.range.start.character, 12, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit1.range.end.line, 39, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit1.range.end.character, 25, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit2 = textEdits[1];
-						assert.strictEqual(textEdit2.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new name");
-						assert.strictEqual(textEdit2.range.start.line, 88, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit2.range.start.character, 3, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit2.range.end.line, 88, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit2.range.end.character, 16, "vscode.executeDocumentRenameProvider provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute rename provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentRenameProvider finds edits to local function from call", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(88, 5);
-		let newText = "newName";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentRenameProvider", uri, position, newText)
-				.then((workspaceEdit: vscode.WorkspaceEdit) =>
-					{
-						assert.strictEqual(workspaceEdit.size, 1,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of uris");
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 2,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of text edits");
-						let textEdit1 = textEdits[0];
-						assert.strictEqual(textEdit1.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new name");
-						assert.strictEqual(textEdit1.range.start.line, 39, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit1.range.start.character, 12, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit1.range.end.line, 39, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit1.range.end.character, 25, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit2 = textEdits[1];
-						assert.strictEqual(textEdit2.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new name");
-						assert.strictEqual(textEdit2.range.start.line, 88, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit2.range.start.character, 3, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit2.range.end.line, 88, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit2.range.end.character, 16, "vscode.executeDocumentRenameProvider provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute rename provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentRenameProvider finds edits for member variable from its declaration", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(10, 16);
-		let newText = "newName";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentRenameProvider", uri, position, newText)
-				.then((workspaceEdit: vscode.WorkspaceEdit) =>
-					{
-						assert.strictEqual(workspaceEdit.size, 1,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of uris");
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 3,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of text edits");
-						let textEdit1 = textEdits[0];
-						assert.strictEqual(textEdit1.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit1.range.start.line, 10, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit1.range.start.character, 14, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit1.range.end.line, 10, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit1.range.end.character, 23, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit2 = textEdits[1];
-						assert.strictEqual(textEdit2.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit2.range.start.line, 50, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit2.range.start.character, 3, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit2.range.end.line, 50, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit2.range.end.character, 12, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit3 = textEdits[2];
-						assert.strictEqual(textEdit3.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit3.range.start.line, 51, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit3.range.start.character, 8, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit3.range.end.line, 51, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit3.range.end.character, 17, "vscode.executeDocumentRenameProvider provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute rename provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentRenameProvider finds edits for member variable from assignment without this member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(50, 5);
-		let newText = "newName";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentRenameProvider", uri, position, newText)
-				.then((workspaceEdit: vscode.WorkspaceEdit) =>
-					{
-						assert.strictEqual(workspaceEdit.size, 1,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of uris");
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 3,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of text edits");
-						let textEdit1 = textEdits[0];
-						assert.strictEqual(textEdit1.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit1.range.start.line, 10, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit1.range.start.character, 14, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit1.range.end.line, 10, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit1.range.end.character, 23, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit2 = textEdits[1];
-						assert.strictEqual(textEdit2.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit2.range.start.line, 50, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit2.range.start.character, 3, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit2.range.end.line, 50, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit2.range.end.character, 12, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit3 = textEdits[2];
-						assert.strictEqual(textEdit3.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit3.range.start.line, 51, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit3.range.start.character, 8, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit3.range.end.line, 51, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit3.range.end.character, 17, "vscode.executeDocumentRenameProvider provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute rename provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentRenameProvider finds edits for member variable from assignment with this member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(51, 10);
-		let newText = "newName";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentRenameProvider", uri, position, newText)
-				.then((workspaceEdit: vscode.WorkspaceEdit) =>
-					{
-						assert.strictEqual(workspaceEdit.size, 1,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of uris");
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 3,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of text edits");
-						let textEdit1 = textEdits[0];
-						assert.strictEqual(textEdit1.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit1.range.start.line, 10, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit1.range.start.character, 14, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit1.range.end.line, 10, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit1.range.end.character, 23, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit2 = textEdits[1];
-						assert.strictEqual(textEdit2.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit2.range.start.line, 50, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit2.range.start.character, 3, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit2.range.end.line, 50, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit2.range.end.character, 12, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit3 = textEdits[2];
-						assert.strictEqual(textEdit3.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit3.range.start.line, 51, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit3.range.start.character, 8, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit3.range.end.line, 51, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit3.range.end.character, 17, "vscode.executeDocumentRenameProvider provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute rename provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentRenameProvider finds edits for member function from its declaration", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(12, 22);
-		let newText = "newName";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentRenameProvider", uri, position, newText)
-				.then((workspaceEdit: vscode.WorkspaceEdit) =>
-					{
-						assert.strictEqual(workspaceEdit.size, 1,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of uris");
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 3,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of text edits");
-						let textEdit1 = textEdits[0];
-						assert.strictEqual(textEdit1.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit1.range.start.line, 12, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit1.range.start.character, 19, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit1.range.end.line, 12, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit1.range.end.character, 33, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit2 = textEdits[1];
-						assert.strictEqual(textEdit2.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit2.range.start.line, 41, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit2.range.start.character, 3, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit2.range.end.line, 41, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit2.range.end.character, 17, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit3 = textEdits[2];
-						assert.strictEqual(textEdit3.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit3.range.start.line, 42, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit3.range.start.character, 8, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit3.range.end.line, 42, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit3.range.end.character, 22, "vscode.executeDocumentRenameProvider provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute rename provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentRenameProvider finds edits for member function from a call without this member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(41, 5);
-		let newText = "newName";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentRenameProvider", uri, position, newText)
-				.then((workspaceEdit: vscode.WorkspaceEdit) =>
-					{
-						assert.strictEqual(workspaceEdit.size, 1,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of uris");
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 3,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of text edits");
-						let textEdit1 = textEdits[0];
-						assert.strictEqual(textEdit1.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit1.range.start.line, 12, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit1.range.start.character, 19, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit1.range.end.line, 12, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit1.range.end.character, 33, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit2 = textEdits[1];
-						assert.strictEqual(textEdit2.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit2.range.start.line, 41, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit2.range.start.character, 3, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit2.range.end.line, 41, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit2.range.end.character, 17, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit3 = textEdits[2];
-						assert.strictEqual(textEdit3.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit3.range.start.line, 42, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit3.range.start.character, 8, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit3.range.end.line, 42, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit3.range.end.character, 22, "vscode.executeDocumentRenameProvider provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute rename provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentRenameProvider finds edits for member function from a call with this member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(42, 10);
-		let newText = "newName";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentRenameProvider", uri, position, newText)
-				.then((workspaceEdit: vscode.WorkspaceEdit) =>
-					{
-						assert.strictEqual(workspaceEdit.size, 1,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of uris");
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 3,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of text edits");
-						let textEdit1 = textEdits[0];
-						assert.strictEqual(textEdit1.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit1.range.start.line, 12, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit1.range.start.character, 19, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit1.range.end.line, 12, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit1.range.end.character, 33, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit2 = textEdits[1];
-						assert.strictEqual(textEdit2.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit2.range.start.line, 41, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit2.range.start.character, 3, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit2.range.end.line, 41, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit2.range.end.character, 17, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit3 = textEdits[2];
-						assert.strictEqual(textEdit3.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit3.range.start.line, 42, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit3.range.start.character, 8, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit3.range.end.line, 42, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit3.range.end.character, 22, "vscode.executeDocumentRenameProvider provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute rename provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentRenameProvider finds edits for static variable from its declaration", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(4, 22);
-		let newText = "newName";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentRenameProvider", uri, position, newText)
-				.then((workspaceEdit: vscode.WorkspaceEdit) =>
-					{
-						assert.strictEqual(workspaceEdit.size, 1,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of uris");
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 3,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of text edits");
-						let textEdit1 = textEdits[0];
-						assert.strictEqual(textEdit1.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit1.range.start.line, 4, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit1.range.start.character, 20, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit1.range.end.line, 4, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit1.range.end.character, 29, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit2 = textEdits[1];
-						assert.strictEqual(textEdit2.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit2.range.start.line, 47, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit2.range.start.character, 3, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit2.range.end.line, 47, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit2.range.end.character, 12, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit3 = textEdits[2];
-						assert.strictEqual(textEdit3.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit3.range.start.line, 48, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit3.range.start.character, 14, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit3.range.end.line, 48, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit3.range.end.character, 23, "vscode.executeDocumentRenameProvider provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute rename provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentRenameProvider finds edits for static variable from assignment without type member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(47, 5);
-		let newText = "newName";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentRenameProvider", uri, position, newText)
-				.then((workspaceEdit: vscode.WorkspaceEdit) =>
-					{
-						assert.strictEqual(workspaceEdit.size, 1,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of uris");
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 3,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of text edits");
-						let textEdit1 = textEdits[0];
-						assert.strictEqual(textEdit1.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit1.range.start.line, 4, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit1.range.start.character, 20, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit1.range.end.line, 4, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit1.range.end.character, 29, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit2 = textEdits[1];
-						assert.strictEqual(textEdit2.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit2.range.start.line, 47, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit2.range.start.character, 3, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit2.range.end.line, 47, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit2.range.end.character, 12, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit3 = textEdits[2];
-						assert.strictEqual(textEdit3.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit3.range.start.line, 48, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit3.range.start.character, 14, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit3.range.end.line, 48, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit3.range.end.character, 23, "vscode.executeDocumentRenameProvider provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute rename provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentRenameProvider finds edits for static variable from assignment with type member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(48, 16);
-		let newText = "newName";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentRenameProvider", uri, position, newText)
-				.then((workspaceEdit: vscode.WorkspaceEdit) =>
-					{
-						assert.strictEqual(workspaceEdit.size, 1,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of uris");
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 3,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of text edits");
-						let textEdit1 = textEdits[0];
-						assert.strictEqual(textEdit1.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit1.range.start.line, 4, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit1.range.start.character, 20, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit1.range.end.line, 4, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit1.range.end.character, 29, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit2 = textEdits[1];
-						assert.strictEqual(textEdit2.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit2.range.start.line, 47, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit2.range.start.character, 3, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit2.range.end.line, 47, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit2.range.end.character, 12, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit3 = textEdits[2];
-						assert.strictEqual(textEdit3.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit3.range.start.line, 48, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit3.range.start.character, 14, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit3.range.end.line, 48, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit3.range.end.character, 23, "vscode.executeDocumentRenameProvider provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute rename provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentRenameProvider finds edits for static function from its declaration", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(6, 28);
-		let newText = "newName";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentRenameProvider", uri, position, newText)
-				.then((workspaceEdit: vscode.WorkspaceEdit) =>
-					{
-						assert.strictEqual(workspaceEdit.size, 1,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of uris");
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 3,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of text edits");
-						let textEdit1 = textEdits[0];
-						assert.strictEqual(textEdit1.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit1.range.start.line, 6, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit1.range.start.character, 26, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit1.range.end.line, 6, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit1.range.end.character, 40, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit2 = textEdits[1];
-						assert.strictEqual(textEdit2.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit2.range.start.line, 44, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit2.range.start.character, 3, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit2.range.end.line, 44, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit2.range.end.character, 17, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit3 = textEdits[2];
-						assert.strictEqual(textEdit3.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit3.range.start.line, 45, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit3.range.start.character, 14, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit3.range.end.line, 45, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit3.range.end.character, 28, "vscode.executeDocumentRenameProvider provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute rename provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentRenameProvider finds edits for static function from call without type member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(44, 5);
-		let newText = "newName";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentRenameProvider", uri, position, newText)
-				.then((workspaceEdit: vscode.WorkspaceEdit) =>
-					{
-						assert.strictEqual(workspaceEdit.size, 1,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of uris");
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 3,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of text edits");
-						let textEdit1 = textEdits[0];
-						assert.strictEqual(textEdit1.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit1.range.start.line, 6, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit1.range.start.character, 26, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit1.range.end.line, 6, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit1.range.end.character, 40, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit2 = textEdits[1];
-						assert.strictEqual(textEdit2.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit2.range.start.line, 44, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit2.range.start.character, 3, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit2.range.end.line, 44, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit2.range.end.character, 17, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit3 = textEdits[2];
-						assert.strictEqual(textEdit3.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit3.range.start.line, 45, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit3.range.start.character, 14, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit3.range.end.line, 45, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit3.range.end.character, 28, "vscode.executeDocumentRenameProvider provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute rename provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentRenameProvider finds edits for static function from call with type member access", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "references", "References.as"));
-		let position = new vscode.Position(45, 16);
-		let newText = "newName";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentRenameProvider", uri, position, newText)
-				.then((workspaceEdit: vscode.WorkspaceEdit) =>
-					{
-						assert.strictEqual(workspaceEdit.size, 1,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of uris");
-						let textEdits = workspaceEdit.get(uri);
-						assert.strictEqual(textEdits.length, 3,
-							"vscode.executeDocumentRenameProvider failed to provide correct number of text edits");
-						let textEdit1 = textEdits[0];
-						assert.strictEqual(textEdit1.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit1.range.start.line, 6, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit1.range.start.character, 26, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit1.range.end.line, 6, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit1.range.end.character, 40, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit2 = textEdits[1];
-						assert.strictEqual(textEdit2.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit2.range.start.line, 44, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit2.range.start.character, 3, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit2.range.end.line, 44, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit2.range.end.character, 17, "vscode.executeDocumentRenameProvider provided incorrect end character");
-						let textEdit3 = textEdits[2];
-						assert.strictEqual(textEdit3.newText, newText, "vscode.executeDocumentRenameProvider provided incorrect new text");
-						assert.strictEqual(textEdit3.range.start.line, 45, "vscode.executeDocumentRenameProvider provided incorrect start line");
-						assert.strictEqual(textEdit3.range.start.character, 14, "vscode.executeDocumentRenameProvider provided incorrect start character");
-						assert.strictEqual(textEdit3.range.end.line, 45, "vscode.executeDocumentRenameProvider provided incorrect end line");
-						assert.strictEqual(textEdit3.range.end.character, 28, "vscode.executeDocumentRenameProvider provided incorrect end character");
-					}, (err) =>
-					{
-						assert(false, "Failed to execute rename provider: " + uri);
-					});
-		});
-	});
+    let query = "WSFindMe";
+    return openAndEditDocument(uri, (editor: vscode.TextEditor) => {
+      return vscode.commands
+        .executeCommand("vscode.executeWorkspaceSymbolProvider", query)
+        .then(
+          (symbols: vscode.SymbolInformation[]) => {
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  className1,
+                  vscode.SymbolKind.Class,
+                  createRange(2, 14),
+                  uri1,
+                  packageName
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for class: " +
+                className1
+            );
+            assert.ok(
+              findSymbolInformation(
+                symbols,
+                new vscode.SymbolInformation(
+                  className2,
+                  vscode.SymbolKind.Class,
+                  createRange(2, 14),
+                  uri2,
+                  packageName
+                )
+              ),
+              "vscode.executeWorkspaceSymbolProvider failed to provide symbol for class: " +
+                className2
+            );
+          },
+          (err) => {
+            assert(
+              false,
+              "Failed to execute workspace symbol provider: " + uri
+            );
+          }
+        );
+    });
+  });
 });
-
-suite("document symbol provider: Library workspace", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeDocumentSymbolProvider not empty", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[1].uri.fsPath, "src", "com", "example", "LibraryDocumentSymbols.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentSymbolProvider", uri)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.notStrictEqual(symbols.length, 0,
-							"vscode.executeDocumentSymbolProvider failed to provide symbols in text document: " + uri);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute document symbol provider: " + uri);
-					});
-		});
-	});
-	test("vscode.executeDocumentSymbolProvider includes class", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[1].uri.fsPath, "src", "com", "example", "LibraryDocumentSymbols.as"));
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeDocumentSymbolProvider", uri)
-				.then((symbols: vscode.DocumentSymbol[]) =>
-					{
-						let className = "LibraryDocumentSymbols";
-						assert.ok(findDocumentSymbol(symbols, new vscode.DocumentSymbol(
-							className,
-							null,
-							vscode.SymbolKind.Class,
-							createRange(2, 14),
-							createRange(2, 14))),
-							"vscode.executeDocumentSymbolProvider failed to provide symbol for class: " + className);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute document symbol provider: " + uri);
-					});
-		});
-	});
-});
-
-suite("workspace symbol provider: multiple workspaces", () =>
-{
-	suiteTeardown(revertAndCloseAllEditors);
-	test("vscode.executeWorkspaceSymbolProvider includes classes from all workspaces", () =>
-	{
-		let uri = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "Main.as"));
-
-		let packageName = "com.example.workspaceSymbols";
-		let uri1 = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[0].uri.fsPath, "src", "com", "example", "workspaceSymbols", "WSFindMe1.as"));
-		let className1 = "WSFindMe1";
-		let uri2 = vscode.Uri.file(path.join(vscode.workspace.workspaceFolders[1].uri.fsPath, "src", "com", "example", "workspaceSymbols", "WSFindMe2.as"));
-		let className2 = "WSFindMe2";
-		
-		let query = "WSFindMe";
-		return openAndEditDocument(uri, (editor: vscode.TextEditor) =>
-		{
-			return vscode.commands.executeCommand("vscode.executeWorkspaceSymbolProvider", query)
-				.then((symbols: vscode.SymbolInformation[]) =>
-					{
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(
-							className1,
-							vscode.SymbolKind.Class,
-							createRange(2, 14),
-							uri1,
-							packageName)),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for class: " + className1);
-						assert.ok(findSymbolInformation(symbols, new vscode.SymbolInformation(
-							className2,
-							vscode.SymbolKind.Class,
-							createRange(2, 14),
-							uri2,
-							packageName)),
-							"vscode.executeWorkspaceSymbolProvider failed to provide symbol for class: " + className2);
-					}, (err) =>
-					{
-						assert(false, "Failed to execute workspace symbol provider: " + uri);
-					});
-		});
-	});
-});
\ No newline at end of file
diff --git a/vscode-extension/src/test/ts/index.ts b/vscode-extension/src/test/ts/index.ts
index 3a50840f8..7226d7ef6 100644
--- a/vscode-extension/src/test/ts/index.ts
+++ b/vscode-extension/src/test/ts/index.ts
@@ -1,5 +1,5 @@
 /*
-Copyright 2016-2020 Bowler Hat LLC
+Copyright 2016-2021 Bowler Hat LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,44 +17,33 @@ import * as path from "path";
 import * as glob from "glob";
 import * as Mocha from "mocha";
 
-export function run(): Promise<void>
-{
-	const mocha = new Mocha({ ui: "tdd", color: true });
-	mocha.timeout(7500);
-
-	const testsRoot = path.resolve(__dirname, "..");
-
-	return new Promise((resolve, reject) =>
-	{
-		glob("**/**.test.js", { cwd: testsRoot }, (error, files) =>
-		{
-			if(error)
-			{
-				return reject(error);
-			}
-
-			// Add files to the test suite
-			files.forEach(file => mocha.addFile(path.resolve(testsRoot, file)));
-
-			try
-			{
-				// Run the mocha test
-				mocha.run(failures =>
-				{
-					if(failures > 0)
-					{
-						reject(new Error(`${failures} tests failed.`));
-					}
-					else
-					{
-						resolve();
-					}
-				});
-			}
-			catch(err)
-			{
-				reject(err);
-			}
-		});
-	});
-}
\ No newline at end of file
+export function run(): Promise<void> {
+  const mocha = new Mocha({ ui: "tdd", color: true });
+  mocha.timeout(7500);
+
+  const testsRoot = path.resolve(__dirname, "..");
+
+  return new Promise((resolve, reject) => {
+    glob("**/**.test.js", { cwd: testsRoot }, (error, files) => {
+      if (error) {
+        return reject(error);
+      }
+
+      // Add files to the test suite
+      files.forEach((file) => mocha.addFile(path.resolve(testsRoot, file)));
+
+      try {
+        // Run the mocha test
+        mocha.run((failures) => {
+          if (failures > 0) {
+            reject(new Error(`${failures} tests failed.`));
+          } else {
+            resolve();
+          }
+        });
+      } catch (err) {
+        reject(err);
+      }
+    });
+  });
+}