@theia/plugin-ext 1.34.2 → 1.36.0-next.21

package/src/common/plugin-protocol.ts

@@ -72,6 +72,7 @@ export namespace PluginPackage {
  * This interface describes a package.json contribution section object.
  */
 export interface PluginPackageContribution {
+    authentication?: PluginPackageAuthenticationProvider[];
     configuration?: RecursivePartial<PreferenceSchema> | RecursivePartial<PreferenceSchema>[];
     configurationDefaults?: RecursivePartial<PreferenceSchemaProperties>;
     languages?: PluginPackageLanguageContribution[];
@@ -96,16 +97,29 @@ export interface PluginPackageContribution {
     resourceLabelFormatters?: ResourceLabelFormatter[];
     localizations?: PluginPackageLocalization[];
     terminal?: PluginPackageTerminal;
+    notebooks?: PluginPackageNotebook[];
+}
+
+export interface PluginPackageNotebook {
+    type: string;
+    displayName: string;
+    selector?: readonly { filenamePattern?: string; excludeFileNamePattern?: string }[];
+    priority?: string;
+}
+
+export interface PluginPackageAuthenticationProvider {
+    id: string;
+    label: string;
 }
 
 export interface PluginPackageTerminalProfile {
-    title: string,
-    id: string,
-    icon?: string
+    title: string;
+    id: string;
+    icon?: string;
 }
 
 export interface PluginPackageTerminal {
-    profiles: PluginPackageTerminalProfile[]
+    profiles: PluginPackageTerminalProfile[];
 }
 
 export interface PluginPackageLocalization {
@@ -544,6 +558,7 @@ export interface PluginEntryPoint {
  */
 export interface PluginContribution {
     activationEvents?: string[];
+    authentication?: AuthenticationProviderInformation[];
     configuration?: PreferenceSchema[];
     configurationDefaults?: PreferenceSchemaProperties;
     languages?: LanguageContribution[];
@@ -567,6 +582,19 @@ export interface PluginContribution {
     resourceLabelFormatters?: ResourceLabelFormatter[];
     localizations?: Localization[];
     terminalProfiles?: TerminalProfile[];
+    notebooks?: NotebookContribution[];
+}
+
+export interface NotebookContribution {
+    type: string;
+    displayName: string;
+    selector?: readonly { filenamePattern?: string; excludeFileNamePattern?: string }[];
+    priority?: string;
+}
+
+export interface AuthenticationProviderInformation {
+    id: string;
+    label: string;
 }
 
 export interface TerminalProfile {
@@ -641,6 +669,11 @@ export interface LanguageContribution {
     configuration?: LanguageConfiguration;
 }
 
+export interface RegExpOptions {
+    pattern: string;
+    flags?: string;
+}
+
 export interface LanguageConfiguration {
     brackets?: CharacterPair[];
     indentationRules?: IndentationRules;
@@ -648,7 +681,7 @@ export interface LanguageConfiguration {
     autoClosingPairs?: AutoClosingPairConditional[];
     comments?: CommentRule;
     folding?: FoldingRules;
-    wordPattern?: string;
+    wordPattern?: string | RegExpOptions;
     onEnterRules?: OnEnterRule[];
 }
 
@@ -674,10 +707,10 @@ export interface DebuggerContribution extends PlatformSpecificAdapterContributio
 }
 
 export interface IndentationRules {
-    increaseIndentPattern: string;
-    decreaseIndentPattern: string;
-    unIndentedLinePattern?: string;
-    indentNextLinePattern?: string;
+    increaseIndentPattern: string | RegExpOptions;
+    decreaseIndentPattern: string | RegExpOptions;
+    unIndentedLinePattern?: string | RegExpOptions;
+    indentNextLinePattern?: string | RegExpOptions;
 }
 export interface AutoClosingPair {
     close: string;
@@ -689,8 +722,8 @@ export interface AutoClosingPairConditional extends AutoClosingPair {
 }
 
 export interface FoldingMarkers {
-    start: string;
-    end: string;
+    start: string | RegExpOptions;
+    end: string | RegExpOptions;
 }
 
 export interface FoldingRules {
@@ -699,9 +732,9 @@ export interface FoldingRules {
 }
 
 export interface OnEnterRule {
-    beforeText: string;
-    afterText?: string;
-    previousLineText?: string;
+    beforeText: string | RegExpOptions;
+    afterText?: string | RegExpOptions;
+    previousLineText?: string | RegExpOptions;
     action: EnterAction;
 }
 

package/src/hosted/browser/hosted-plugin.ts

@@ -375,6 +375,7 @@ export class HostedPluginSupport {
         const loadPluginsMeasurement = this.measure('loadPlugins');
 
         const hostContributions = new Map<PluginHost, PluginContributions[]>();
+        console.log(`[${this.clientId}] Loading plugin contributions`);
         for (const contributions of this.contributions.values()) {
             const plugin = contributions.plugin.metadata;
             const pluginId = plugin.model.id;
@@ -384,7 +385,7 @@ export class HostedPluginSupport {
                 contributions.push(Disposable.create(() => console.log(`[${pluginId}]: Unloaded plugin.`)));
                 contributions.push(this.contributionHandler.handleContributions(this.clientId, contributions.plugin));
                 contributions.state = PluginContributions.State.LOADED;
-                console.log(`[${this.clientId}][${pluginId}]: Loaded contributions.`);
+                console.debug(`[${this.clientId}][${pluginId}]: Loaded contributions.`);
                 loaded++;
             }
 
@@ -396,7 +397,7 @@ export class HostedPluginSupport {
                 hostContributions.set(host, dynamicContributions);
                 toDisconnect.push(Disposable.create(() => {
                     contributions!.state = PluginContributions.State.LOADED;
-                    console.log(`[${this.clientId}][${pluginId}]: Disconnected.`);
+                    console.debug(`[${this.clientId}][${pluginId}]: Disconnected.`);
                 }));
             }
         }
@@ -446,14 +447,15 @@ export class HostedPluginSupport {
                     if (toDisconnect.disposed) {
                         return;
                     }
+                    console.log(`[${this.clientId}] Starting plugins.`);
                     for (const contributions of hostContributions) {
                         started++;
                         const plugin = contributions.plugin;
                         const id = plugin.metadata.model.id;
                         contributions.state = PluginContributions.State.STARTED;
-                        console.log(`[${this.clientId}][${id}]: Started plugin.`);
+                        console.debug(`[${this.clientId}][${id}]: Started plugin.`);
                         toDisconnect.push(contributions.push(Disposable.create(() => {
-                            console.log(`[${this.clientId}][${id}]: Stopped plugin.`);
+                            console.debug(`[${this.clientId}][${id}]: Stopped plugin.`);
                             manager.$stop(id);
                         })));
 
@@ -778,22 +780,15 @@ export class HostedPluginSupport {
     protected async restoreWebview(webview: WebviewWidget): Promise<void> {
         await this.activateByEvent(`onWebviewPanel:${webview.viewType}`);
         const restore = this.webviewRevivers.get(webview.viewType);
-        if (!restore) {
-            /* eslint-disable max-len */
-            webview.setHTML(this.getDeserializationFailedContents(`
-            <p>The extension providing '${webview.viewType}' view is not capable of restoring it.</p>
-            <p>Want to help fix this? Please inform the extension developer to register a <a href="https://code.visualstudio.com/api/extension-guides/webview#serialization">reviver</a>.</p>
-            `));
-            /* eslint-enable max-len */
-            return;
-        }
-        try {
-            await restore(webview);
-        } catch (e) {
-            webview.setHTML(this.getDeserializationFailedContents(`
-            An error occurred while restoring '${webview.viewType}' view. Please check logs.
-            `));
-            console.error('Failed to restore the webview', e);
+        if (restore) {
+            try {
+                await restore(webview);
+            } catch (e) {
+                webview.setHTML(this.getDeserializationFailedContents(`
+                An error occurred while restoring '${webview.viewType}' view. Please check logs.
+                `));
+                console.error('Failed to restore the webview', e);
+            }
         }
     }
 

package/src/hosted/node/hosted-plugin-deployer-handler.ts

@@ -176,7 +176,7 @@ export class HostedPluginDeployerHandler implements PluginDeployerHandler {
             deployed.contributes = this.reader.readContribution(manifest);
             this.localizationService.deployLocalizations(deployed);
             deployedPlugins.set(id, deployed);
-            deployPlugin.log(`Deployed ${entryPoint} plugin "${id}" from "${metadata.model.entryPoint[entryPoint] || pluginPath}"`);
+            deployPlugin.debug(`Deployed ${entryPoint} plugin "${id}" from "${metadata.model.entryPoint[entryPoint] || pluginPath}"`);
         } catch (e) {
             deployPlugin.error(`Failed to deploy ${entryPoint} plugin from '${pluginPath}' path`, e);
             return success = false;

package/src/hosted/node/hosted-plugin-process.ts

@@ -126,7 +126,7 @@ export class HostedPluginProcess implements ServerPluginRunner {
             await waitForTerminated.promise;
         }
 
-        this.killProcessTree(cp.pid);
+        this.killProcessTree(cp.pid!);
     }
 
     killProcessTree(parentPid: number): void {
@@ -206,7 +206,7 @@ export class HostedPluginProcess implements ServerPluginRunner {
         childProcess.stderr!.on('data', data => this.logger.error(`[${options.serverName}: ${childProcess.pid}] ${data.toString().trim()}`));
 
         this.logger.debug(`[${options.serverName}: ${childProcess.pid}] IPC started`);
-        childProcess.once('exit', (code: number, signal: string) => this.onChildProcessExit(options.serverName, childProcess.pid, code, signal));
+        childProcess.once('exit', (code: number, signal: string) => this.onChildProcessExit(options.serverName, childProcess.pid!, code, signal));
         childProcess.on('error', err => this.onChildProcessError(err));
         return childProcess;
     }

package/src/hosted/node/plugin-activation-events.ts

@@ -0,0 +1,111 @@
+// *****************************************************************************
+// Copyright (C) 2023 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { flatten } from '../../common/arrays';
+import { isStringArray, isObject } from '@theia/core/lib/common/types';
+import {
+    PluginPackage,
+    PluginPackageAuthenticationProvider,
+    PluginPackageCommand,
+    PluginPackageCustomEditor,
+    PluginPackageLanguageContribution,
+    PluginPackageNotebook,
+    PluginPackageView
+} from '../../common/plugin-protocol';
+
+/**
+ * Most activation events can be automatically deduced from the package manifest.
+ * This function will update the manifest based on the plugin contributions.
+ */
+export function updateActivationEvents(manifest: PluginPackage): void {
+    if (!isObject(manifest) || !isObject(manifest.contributes) || !manifest.contributes) {
+        return;
+    }
+
+    const activationEvents = new Set(isStringArray(manifest.activationEvents) ? manifest.activationEvents : []);
+
+    if (manifest.contributes.commands) {
+        const value = manifest.contributes.commands;
+        const commands = Array.isArray(value) ? value : [value];
+        updateCommandsContributions(commands, activationEvents);
+    }
+    if (Array.isArray(manifest.contributes.views)) {
+        const views = flatten(Object.values(manifest.contributes.views)) as PluginPackageView[];
+        updateViewsContribution(views, activationEvents);
+    }
+    if (Array.isArray(manifest.contributes.customEditors)) {
+        updateCustomEditorsContribution(manifest.contributes.customEditors, activationEvents);
+    }
+    if (Array.isArray(manifest.contributes.authentication)) {
+        updateAuthenticationProviderContributions(manifest.contributes.authentication, activationEvents);
+    }
+    if (Array.isArray(manifest.contributes.languages)) {
+        updateLanguageContributions(manifest.contributes.languages, activationEvents);
+    }
+    if (Array.isArray(manifest.contributes.notebooks)) {
+        updateNotebookContributions(manifest.contributes.notebooks, activationEvents);
+    }
+
+    manifest.activationEvents = Array.from(activationEvents);
+}
+
+function updateViewsContribution(views: PluginPackageView[], activationEvents: Set<string>): void {
+    for (const view of views) {
+        if (isObject(view) && typeof view.id === 'string') {
+            activationEvents.add(`onView:${view.id}`);
+        }
+    }
+}
+
+function updateCustomEditorsContribution(customEditors: PluginPackageCustomEditor[], activationEvents: Set<string>): void {
+    for (const customEditor of customEditors) {
+        if (isObject(customEditor) && typeof customEditor.viewType === 'string') {
+            activationEvents.add(`onCustomEditor:${customEditor.viewType}`);
+        }
+    }
+}
+
+function updateCommandsContributions(commands: PluginPackageCommand[], activationEvents: Set<string>): void {
+    for (const command of commands) {
+        if (isObject(command) && typeof command.command === 'string') {
+            activationEvents.add(`onCommand:${command.command}`);
+        }
+    }
+}
+
+function updateAuthenticationProviderContributions(authProviders: PluginPackageAuthenticationProvider[], activationEvents: Set<string>): void {
+    for (const authProvider of authProviders) {
+        if (isObject(authProvider) && typeof authProvider.id === 'string') {
+            activationEvents.add(`onAuthenticationRequest:${authProvider.id}`);
+        }
+    }
+}
+
+function updateLanguageContributions(languages: PluginPackageLanguageContribution[], activationEvents: Set<string>): void {
+    for (const language of languages) {
+        if (isObject(language) && typeof language.id === 'string') {
+            activationEvents.add(`onLanguage:${language.id}`);
+        }
+    }
+}
+
+function updateNotebookContributions(notebooks: PluginPackageNotebook[], activationEvents: Set<string>): void {
+    for (const notebook of notebooks) {
+        if (isObject(notebook) && typeof notebook.type === 'string') {
+            activationEvents.add(`onNotebookSerializer:${notebook.type}`);
+        }
+    }
+}

package/src/hosted/node/plugin-host-rpc.ts

@@ -91,7 +91,7 @@ export class PluginHostRPC {
 
     initContext(contextPath: string, plugin: Plugin): void {
         const { name, version } = plugin.rawModel;
-        console.log('PLUGIN_HOST(' + process.pid + '): initializing(' + name + '@' + version + ' with ' + contextPath + ')');
+        console.debug('PLUGIN_HOST(' + process.pid + '): initializing(' + name + '@' + version + ' with ' + contextPath + ')');
         try {
             const backendInit = dynamicRequire<{ doInitialization: BackendInitializationFn }>(contextPath);
             backendInit.doInitialization(this.apiFactory, plugin);
@@ -111,7 +111,7 @@ export class PluginHostRPC {
         const pluginManager = new PluginManagerExtImpl({
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             loadPlugin(plugin: Plugin): any {
-                console.log('PLUGIN_HOST(' + process.pid + '): PluginManagerExtImpl/loadPlugin(' + plugin.pluginPath + ')');
+                console.debug('PLUGIN_HOST(' + process.pid + '): PluginManagerExtImpl/loadPlugin(' + plugin.pluginPath + ')');
                 // cleaning the cache for all files of that plug-in.
                 Object.keys(require.cache).forEach(function (key): void {
                     const mod: NodeJS.Module = require.cache[key]!;

package/src/hosted/node/plugin-manifest-loader.ts

@@ -16,10 +16,10 @@
 
 import * as path from 'path';
 import * as fs from '@theia/core/shared/fs-extra';
-import { PluginIdentifiers } from '../../common';
+import { PluginIdentifiers, PluginPackage } from '../../common';
+import { updateActivationEvents } from './plugin-activation-events';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export async function loadManifest(pluginPath: string): Promise<any> {
+export async function loadManifest(pluginPath: string): Promise<PluginPackage> {
     const manifest = await fs.readJson(path.join(pluginPath, 'package.json'));
     // translate vscode builtins, as they are published with a prefix. See https://github.com/theia-ide/vscode-builtin-extensions/blob/master/src/republish.js#L50
     const built_prefix = '@theia/vscode-builtin-';
@@ -27,5 +27,6 @@ export async function loadManifest(pluginPath: string): Promise<any> {
         manifest.name = manifest.name.substr(built_prefix.length);
     }
     manifest.publisher ??= PluginIdentifiers.UNPUBLISHED;
+    updateActivationEvents(manifest);
     return manifest;
 }

package/src/hosted/node/scanners/scanner-theia.ts

@@ -64,21 +64,15 @@ import {
 } from '../../../common/plugin-protocol';
 import * as fs from 'fs';
 import * as path from 'path';
-import { isObject } from 'util';
+import { isObject, isStringArray, RecursivePartial } from '@theia/core/lib/common/types';
 import { GrammarsReader } from './grammars-reader';
 import { CharacterPair } from '../../../common/plugin-api-rpc';
 import * as jsoncparser from 'jsonc-parser';
 import { IJSONSchema } from '@theia/core/lib/common/json-schema';
 import { deepClone } from '@theia/core/lib/common/objects';
 import { PreferenceSchema, PreferenceSchemaProperties } from '@theia/core/lib/common/preferences/preference-schema';
-import { RecursivePartial } from '@theia/core/lib/common/types';
-import {
-    ProblemMatcherContribution,
-    ProblemPatternContribution,
-    TaskDefinition
-} from '@theia/task/lib/common/task-protocol';
+import { TaskDefinition } from '@theia/task/lib/common/task-protocol';
 import { ColorDefinition } from '@theia/core/lib/common/color';
-import { ResourceLabelFormatter } from '@theia/core/lib/common/label-protocol';
 import { PluginUriFactory } from './plugin-uri-factory';
 
 namespace nls {
@@ -181,42 +175,42 @@ export class TheiaPluginScanner implements PluginScanner {
         contributions.configurationDefaults = PreferenceSchemaProperties.is(configurationDefaults) ? configurationDefaults : undefined;
 
         try {
-            if (rawPlugin.contributes!.languages) {
-                const languages = this.readLanguages(rawPlugin.contributes.languages!, rawPlugin.packagePath);
+            if (rawPlugin.contributes.languages) {
+                const languages = this.readLanguages(rawPlugin.contributes.languages, rawPlugin.packagePath);
                 contributions.languages = languages;
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'languages'.`, rawPlugin.contributes!.languages, err);
+            console.error(`Could not read '${rawPlugin.name}' contribution 'languages'.`, rawPlugin.contributes.languages, err);
         }
 
         try {
-            if (rawPlugin.contributes!.submenus) {
-                contributions.submenus = this.readSubmenus(rawPlugin.contributes.submenus!, rawPlugin);
+            if (rawPlugin.contributes.submenus) {
+                contributions.submenus = this.readSubmenus(rawPlugin.contributes.submenus, rawPlugin);
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'submenus'.`, rawPlugin.contributes!.submenus, err);
+            console.error(`Could not read '${rawPlugin.name}' contribution 'submenus'.`, rawPlugin.contributes.submenus, err);
         }
 
         try {
-            if (rawPlugin.contributes!.grammars) {
-                const grammars = this.grammarsReader.readGrammars(rawPlugin.contributes.grammars!, rawPlugin.packagePath);
+            if (rawPlugin.contributes.grammars) {
+                const grammars = this.grammarsReader.readGrammars(rawPlugin.contributes.grammars, rawPlugin.packagePath);
                 contributions.grammars = grammars;
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'grammars'.`, rawPlugin.contributes!.grammars, err);
+            console.error(`Could not read '${rawPlugin.name}' contribution 'grammars'.`, rawPlugin.contributes.grammars, err);
         }
 
         try {
-            if (rawPlugin.contributes?.customEditors) {
-                const customEditors = this.readCustomEditors(rawPlugin.contributes.customEditors!);
+            if (rawPlugin.contributes.customEditors) {
+                const customEditors = this.readCustomEditors(rawPlugin.contributes.customEditors);
                 contributions.customEditors = customEditors;
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'customEditors'.`, rawPlugin.contributes!.customEditors, err);
+            console.error(`Could not read '${rawPlugin.name}' contribution 'customEditors'.`, rawPlugin.contributes.customEditors, err);
         }
 
         try {
-            if (rawPlugin.contributes && rawPlugin.contributes.viewsContainers) {
+            if (rawPlugin.contributes.viewsContainers) {
                 const viewsContainers = rawPlugin.contributes.viewsContainers;
                 contributions.viewsContainers = {};
 
@@ -231,28 +225,28 @@ export class TheiaPluginScanner implements PluginScanner {
                 }
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'viewsContainers'.`, rawPlugin.contributes!.viewsContainers, err);
+            console.error(`Could not read '${rawPlugin.name}' contribution 'viewsContainers'.`, rawPlugin.contributes.viewsContainers, err);
         }
 
         try {
-            if (rawPlugin.contributes!.views) {
+            if (rawPlugin.contributes.views) {
                 contributions.views = {};
 
-                Object.keys(rawPlugin.contributes.views!).forEach(location => {
-                    const views = this.readViews(rawPlugin.contributes!.views![location]);
-                    contributions.views![location] = views;
-                });
+                for (const location of Object.keys(rawPlugin.contributes.views)) {
+                    const views = this.readViews(rawPlugin.contributes.views[location]);
+                    contributions.views[location] = views;
+                }
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'views'.`, rawPlugin.contributes!.views, err);
+            console.error(`Could not read '${rawPlugin.name}' contribution 'views'.`, rawPlugin.contributes.views, err);
         }
 
         try {
-            if (rawPlugin.contributes!.viewsWelcome) {
-                contributions.viewsWelcome = this.readViewsWelcome(rawPlugin.contributes!.viewsWelcome, rawPlugin.contributes!.views);
+            if (rawPlugin.contributes.viewsWelcome) {
+                contributions.viewsWelcome = this.readViewsWelcome(rawPlugin.contributes!.viewsWelcome, rawPlugin.contributes.views);
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'viewsWelcome'.`, rawPlugin.contributes!.viewsWelcome, err);
+            console.error(`Could not read '${rawPlugin.name}' contribution 'viewsWelcome'.`, rawPlugin.contributes.viewsWelcome, err);
         }
 
         try {
@@ -266,67 +260,73 @@ export class TheiaPluginScanner implements PluginScanner {
         }
 
         try {
-            if (rawPlugin.contributes!.menus) {
+            if (rawPlugin.contributes.menus) {
                 contributions.menus = {};
 
-                Object.keys(rawPlugin.contributes.menus!).forEach(location => {
-                    const menus = this.readMenus(rawPlugin.contributes!.menus![location]);
-                    contributions.menus![location] = menus;
-                });
+                for (const location of Object.keys(rawPlugin.contributes.menus)) {
+                    const menus = this.readMenus(rawPlugin.contributes.menus[location]);
+                    contributions.menus[location] = menus;
+                }
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'menus'.`, rawPlugin.contributes!.menus, err);
+            console.error(`Could not read '${rawPlugin.name}' contribution 'menus'.`, rawPlugin.contributes.menus, err);
         }
 
         try {
-            if (rawPlugin.contributes! && rawPlugin.contributes.keybindings) {
+            if (rawPlugin.contributes.keybindings) {
                 const rawKeybindings = Array.isArray(rawPlugin.contributes.keybindings) ? rawPlugin.contributes.keybindings : [rawPlugin.contributes.keybindings];
                 contributions.keybindings = rawKeybindings.map(rawKeybinding => this.readKeybinding(rawKeybinding));
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'keybindings'.`, rawPlugin.contributes!.keybindings, err);
+            console.error(`Could not read '${rawPlugin.name}' contribution 'keybindings'.`, rawPlugin.contributes.keybindings, err);
         }
 
         try {
-            if (rawPlugin.contributes!.debuggers) {
-                const debuggers = this.readDebuggers(rawPlugin.contributes.debuggers!);
+            if (rawPlugin.contributes.debuggers) {
+                const debuggers = this.readDebuggers(rawPlugin.contributes.debuggers);
                 contributions.debuggers = debuggers;
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'debuggers'.`, rawPlugin.contributes!.debuggers, err);
+            console.error(`Could not read '${rawPlugin.name}' contribution 'debuggers'.`, rawPlugin.contributes.debuggers, err);
         }
 
         try {
-            if (rawPlugin.contributes!.taskDefinitions) {
-                const definitions = rawPlugin.contributes!.taskDefinitions!;
+            if (rawPlugin.contributes.taskDefinitions) {
+                const definitions = rawPlugin.contributes.taskDefinitions!;
                 contributions.taskDefinitions = definitions.map(definitionContribution => this.readTaskDefinition(rawPlugin.name, definitionContribution));
             }
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'taskDefinitions'.`, rawPlugin.contributes!.taskDefinitions, err);
+            console.error(`Could not read '${rawPlugin.name}' contribution 'taskDefinitions'.`, rawPlugin.contributes.taskDefinitions, err);
         }
 
         try {
-            if (rawPlugin.contributes!.problemMatchers) {
-                contributions.problemMatchers = rawPlugin.contributes!.problemMatchers as ProblemMatcherContribution[];
-            }
+            contributions.problemMatchers = rawPlugin.contributes.problemMatchers;
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'problemMatchers'.`, rawPlugin.contributes!.problemMatchers, err);
+            console.error(`Could not read '${rawPlugin.name}' contribution 'problemMatchers'.`, rawPlugin.contributes.problemMatchers, err);
         }
 
         try {
-            if (rawPlugin.contributes!.problemPatterns) {
-                contributions.problemPatterns = rawPlugin.contributes!.problemPatterns as ProblemPatternContribution[];
-            }
+            contributions.problemPatterns = rawPlugin.contributes.problemPatterns;
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'problemPatterns'.`, rawPlugin.contributes!.problemPatterns, err);
+            console.error(`Could not read '${rawPlugin.name}' contribution 'problemPatterns'.`, rawPlugin.contributes.problemPatterns, err);
         }
 
         try {
-            if (rawPlugin.contributes!.resourceLabelFormatters) {
-                contributions.resourceLabelFormatters = rawPlugin.contributes!.resourceLabelFormatters as ResourceLabelFormatter[];
-            }
+            contributions.resourceLabelFormatters = rawPlugin.contributes.resourceLabelFormatters;
+        } catch (err) {
+            console.error(`Could not read '${rawPlugin.name}' contribution 'resourceLabelFormatters'.`, rawPlugin.contributes.resourceLabelFormatters, err);
+        }
+
+        try {
+            contributions.authentication = rawPlugin.contributes.authentication;
+        } catch (err) {
+            console.error(`Could not read '${rawPlugin.name}' contribution 'authentication'.`, rawPlugin.contributes.authentication, err);
+        }
+
+        try {
+            contributions.notebooks = rawPlugin.contributes.notebooks;
         } catch (err) {
-            console.error(`Could not read '${rawPlugin.name}' contribution 'resourceLabelFormatters'.`, rawPlugin.contributes!.resourceLabelFormatters, err);
+            console.error(`Could not read '${rawPlugin.name}' contribution 'notebooks'.`, rawPlugin.contributes.authentication, err);
         }
 
         try {
@@ -837,7 +837,6 @@ export class TheiaPluginScanner implements PluginScanner {
         }
 
         let result: AutoClosingPairConditional[] | undefined = undefined;
-        // tslint:disable-next-line:one-variable-per-declaration
         for (let i = 0, len = source.length; i < len; i++) {
             const pair = source[i];
             if (Array.isArray(pair)) {
@@ -861,7 +860,7 @@ export class TheiaPluginScanner implements PluginScanner {
                     continue;
                 }
                 if (typeof pair.notIn !== 'undefined') {
-                    if (!isStringArr(pair.notIn)) {
+                    if (!isStringArray(pair.notIn)) {
                         console.warn(`[${langId}]: language configuration: expected \`autoClosingPairs[${i}].notIn\` to be a string array.`);
                         continue;
                     }
@@ -884,7 +883,6 @@ export class TheiaPluginScanner implements PluginScanner {
         }
 
         let result: AutoClosingPair[] | undefined = undefined;
-        // tslint:disable-next-line:one-variable-per-declaration
         for (let i = 0, len = source.length; i < len; i++) {
             const pair = source[i];
             if (Array.isArray(pair)) {
@@ -918,21 +916,7 @@ export class TheiaPluginScanner implements PluginScanner {
 
 function isCharacterPair(something: CharacterPair): boolean {
     return (
-        isStringArr(something)
+        isStringArray(something)
         && something.length === 2
     );
 }
-
-function isStringArr(something: string[]): boolean {
-    if (!Array.isArray(something)) {
-        return false;
-    }
-    // tslint:disable-next-line:one-variable-per-declaration
-    for (let i = 0, len = something.length; i < len; i++) {
-        if (typeof something[i] !== 'string') {
-            return false;
-        }
-    }
-    return true;
-
-}