Skip to content

Commit f51aa96

Browse files
committed
🚬
1 parent 6f2b7cb commit f51aa96

File tree

5 files changed

+17
-46
lines changed

5 files changed

+17
-46
lines changed

‎src/config.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/extension.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,10 @@
33
import { workspace, languages, ExtensionContext} from 'vscode';
44
import { LinkProvider } from './providers/linkProvider';
55
import { HoverProvider } from './providers/hoverProvider';
6-
import { selector } from "./config";
7-
import * as util from "./util";
86

97
export function activate(context: ExtensionContext) {
10-
context.workspaceState.update('isLaravel', true);
11-
console.log(context.workspaceState.get<boolean>('isLaravel'));
12-
13-
let hover = languages.registerHoverProvider(selector, new HoverProvider());
14-
let link = languages.registerDocumentLinkProvider(selector, new LinkProvider());
15-
8+
let hover = languages.registerHoverProvider(['php', 'blade', 'laravel-blade'], new HoverProvider());
9+
let link = languages.registerDocumentLinkProvider(['php', 'blade', 'laravel-blade'], new LinkProvider());
1610
context.subscriptions.push(hover, link);
1711
}
1812

‎src/providers/hoverProvider.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@ import * as vscode from "vscode";
44
import * as util from '../util';
55

66
export class HoverProvider implements vscode.HoverProvider {
7-
// constructor(parameters) {
8-
9-
// }
10-
11-
provideHover(doc, pos, token): vscode.ProviderResult<vscode.Hover> {
12-
const REG = /(['"])[^'"]*\1/;
7+
provideHover(doc: vscode.TextDocument, pos: vscode.Position, token: vscode.CancellationToken): vscode.ProviderResult<vscode.Hover> {
8+
if (doc.fileName.indexOf('web.php') != -1 || doc.fileName.indexOf('api.php') != -1) {
9+
return;
10+
}
11+
let reg = /(['"])[^'"]*\1/;
1312
let config = vscode.workspace.getConfiguration('laravel_goto_view');
14-
let linkRange = doc.getWordRangeAtPosition(pos, REG);
13+
let linkRange = doc.getWordRangeAtPosition(pos, reg);
1514
if(linkRange){
1615
let filePaths = util.getFilePaths(doc.getText(linkRange), doc);
1716
let workspaceFolder = vscode.workspace.getWorkspaceFolder(doc.uri);

‎src/providers/linkProvider.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,21 @@ import * as vscode from "vscode";
44
import * as util from '../util';
55

66
export class LinkProvider implements vscode.DocumentLinkProvider {
7-
public provideDocumentLinks(document: vscode.TextDocument, token: vscode.CancellationToken): vscode.ProviderResult<vscode.DocumentLink[]> {
8-
let config = vscode.workspace.getConfiguration('laravel_goto_view');
7+
public provideDocumentLinks(doc: vscode.TextDocument, token: vscode.CancellationToken): vscode.ProviderResult<vscode.DocumentLink[]> {
98
let documentLinks = [];
9+
if (doc.fileName.indexOf('web.php') != -1 || doc.fileName.indexOf('api.php') != -1) {
10+
return;
11+
}
12+
let config = vscode.workspace.getConfiguration('laravel_goto_view');
1013
let index = 0;
1114
let reg = /(['"])[^'"]*\1/g;
12-
1315
if (config.quickJump) {
14-
while (index < document.lineCount) {
15-
let line = document.lineAt(index);
16+
while (index < doc.lineCount) {
17+
let line = doc.lineAt(index);
1618
let result = line.text.match(reg);
1719
if (result != null) {
1820
for (let item of result) {
19-
let file = util.getFilePath(item, document);
21+
let file = util.getFilePath(item, doc);
2022
if(file != null){
2123
let start = new vscode.Position(line.lineNumber, line.text.indexOf(item) + 1);
2224
let end = start.translate(0, item.length - 2);

‎src/util.ts

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export function getFilePath(text: string, document: TextDocument) {
99
return paths.length > 0 ? paths[0] : null;
1010
}
1111

12-
export function getFilePaths(text: string, document: TextDocument): any {
12+
export function getFilePaths(text: string, document: TextDocument) {
1313
let paths = scanViewPaths(document);
1414
let config = workspace.getConfiguration('laravel_goto_view');
1515
let workspaceFolder = workspace.getWorkspaceFolder(document.uri).uri.fsPath;
@@ -47,23 +47,6 @@ export function getFilePaths(text: string, document: TextDocument): any {
4747
return result;
4848
}
4949

50-
export function readText(uri: Uri) {
51-
52-
return new Promise((resolve, reject) => {
53-
54-
fs.readFile(uri.fsPath, (readErr, data) => {
55-
56-
if (readErr) {
57-
reject(readErr.message);
58-
return;
59-
}
60-
61-
resolve(data.toString());
62-
63-
});
64-
});
65-
}
66-
6750
export function scanViewPaths(document: TextDocument) {
6851
let configFolders = workspace.getConfiguration('laravel_goto_view.folders');
6952
let folders = {};

0 commit comments

Comments
 (0)