cleanup

Author: ctf0

src/extension.ts

@@ -1,8 +1,8 @@
 'use strict';
 
 import { languages, ExtensionContext } from 'vscode';
-import { LinkProvider } from './providers/linkProvider';
-import { HoverProvider } from './providers/hoverProvider';
+import LinkProvider from './providers/linkProvider';
+import HoverProvider from './providers/hoverProvider';
 
 export function activate(context: ExtensionContext) {
     let hover = languages.registerHoverProvider(['php', 'blade', 'laravel-blade'], new HoverProvider());

src/providers/hoverProvider.ts

@@ -11,23 +11,24 @@ import {
 } from "vscode";
 import * as util from '../util';
 
-export class HoverProvider implements vsHoverProvider {
+export default class HoverProvider implements vsHoverProvider {
     provideHover(doc: TextDocument, pos: Position): ProviderResult<Hover> {
         let reg = /(?<=view\(|@include\(|@extends\(|@component\()(['"])[^'"]*\1/;
         let config = workspace.getConfiguration('laravel_goto_view');
         let linkRange = doc.getWordRangeAtPosition(pos, reg);
-        if (linkRange) {
-            let filePaths = util.getFilePaths(doc.getText(linkRange), doc);
-            let workspaceFolder = workspace.getWorkspaceFolder(doc.uri);
-            if (filePaths.length > 0) {
-                let text: string = "";
-                for (let i in filePaths) {
-                    text += config.folderTip ? `\`${filePaths[i].name}\`` : '';
-                    text += ` [${workspaceFolder.name + filePaths[i].showPath}](${filePaths[i].fileUri})  \r`;
-                }
-                return new Hover(new MarkdownString(text));
+
+        if (!linkRange) return
+
+        let filePaths = util.getFilePaths(doc.getText(linkRange), doc);
+        let workspaceFolder = workspace.getWorkspaceFolder(doc.uri);
+        if (filePaths.length > 0) {
+            let text: string = "";
+            for (let i in filePaths) {
+                text += config.folderTip ? `\`${filePaths[i].name}\`` : '';
+                text += ` [${workspaceFolder.name + filePaths[i].showPath}](${filePaths[i].fileUri})  \r`;
             }
+
+            return new Hover(new MarkdownString(text));
         }
-        return;
     }
 }

src/providers/linkProvider.ts

@@ -11,12 +11,13 @@ import {
 } from "vscode"
 import * as util from '../util';
 
-export class LinkProvider implements vsDocumentLinkProvider {
+export default class LinkProvider implements vsDocumentLinkProvider {
     public provideDocumentLinks(doc: TextDocument): ProviderResult<DocumentLink[]> {
         let documentLinks = [];
         let config = workspace.getConfiguration('laravel_goto_view');
         let index = 0;
         let reg = /(?<=view\(|@include\(|@extends\(|@component\()(['"])[^'"]*\1/g;
+
         if (config.quickJump) {
             while (index < doc.lineCount) {
                 let line = doc.lineAt(index);
@@ -35,6 +36,7 @@ export class LinkProvider implements vsDocumentLinkProvider {
                 index++;
             }
         }
+
         return documentLinks;
     }
 }