Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix symlinks should be resolved when initializing plugins #12841

Merged
merged 3 commits into from
Oct 2, 2023
Merged

Fix symlinks should be resolved when initializing plugins #12841

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b045267
Fix symlinks should be resolved when initializing plugins
vatsal-uppal-1997 Aug 18, 2023
18924e2
Added symlink resolution to backend-init-theia and HostedPluginReader…
vatsal-uppal-1997 Sep 30, 2023
d0ed4e7
Removed unnecessary changes
vatsal-uppal-1997 Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/plugin-ext-vscode/src/node/plugin-vscode-init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import * as theia from '@theia/plugin';
import { BackendInitializationFn, PluginAPIFactory, Plugin, emptyPlugin } from '@theia/plugin-ext';
import { VSCODE_DEFAULT_API_VERSION } from '../common/plugin-vscode-types';
import { realpathSync } from 'fs';
msujew marked this conversation as resolved.
Show resolved Hide resolved

process.env['VSCODE_PID'] = process.env['THEIA_PARENT_PID'];

Expand All @@ -30,7 +31,7 @@ let pluginApiFactory: PluginAPIFactory;

export const doInitialization: BackendInitializationFn = (apiFactory: PluginAPIFactory, plugin: Plugin) => {
pluginsApiImpl.set(plugin.model.id, createVSCodeAPI(apiFactory, plugin));
plugins.push(plugin);
plugins.push({ ...plugin, pluginFolder: realpathSync(plugin.pluginFolder) });
msujew marked this conversation as resolved.
Show resolved Hide resolved
pluginApiFactory = apiFactory;

if (!isLoadOverride) {
Expand Down
6 changes: 4 additions & 2 deletions packages/plugin-ext/src/hosted/node/plugin-reader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import * as path from 'path';
import * as express from '@theia/core/shared/express';
import * as escape_html from 'escape-html';
import { realpath } from 'fs/promises';
import { ILogger } from '@theia/core';
import { inject, injectable, optional, multiInject } from '@theia/core/shared/inversify';
import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application';
Expand Down Expand Up @@ -93,11 +94,12 @@ export class HostedPluginReader implements BackendApplicationContribution {
if (!pluginPath) {
return undefined;
}
const manifest = await loadManifest(pluginPath);
const resolvedPluginPath = await realpath(pluginPath);
const manifest = await loadManifest(resolvedPluginPath);
if (!manifest) {
return undefined;
}
manifest.packagePath = pluginPath;
manifest.packagePath = resolvedPluginPath;
return manifest;
}

Expand Down
3 changes: 2 additions & 1 deletion packages/plugin-ext/src/hosted/node/scanners/backend-init-theia.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import * as theia from '@theia/plugin';
import { BackendInitializationFn } from '../../../common/plugin-protocol';
import { PluginAPIFactory, Plugin, emptyPlugin } from '../../../common/plugin-api-rpc';
import { realpathSync } from 'fs';

const pluginsApiImpl = new Map<string, typeof theia>();
const plugins = new Array<Plugin>();
Expand All @@ -29,7 +30,7 @@ export const doInitialization: BackendInitializationFn = (apiFactory: PluginAPIF
const apiImpl = apiFactory(plugin);
pluginsApiImpl.set(plugin.model.id, apiImpl);

plugins.push(plugin);
plugins.push({ ...plugin, pluginFolder: realpathSync(plugin.pluginFolder) });
msujew marked this conversation as resolved.
Show resolved Hide resolved
pluginApiFactory = apiFactory;

if (!isLoadOverride) {
Expand Down