rename glass to LineMage

This commit is contained in:
Andrew
2024-09-10 21:22:34 -07:00
parent 93132a36e6
commit cfe968d024
15 changed files with 36 additions and 37 deletions

View File

@ -1,5 +1,5 @@
{
"name": "Code - OSS",
"name": "LineMage",
"build": {
"dockerfile": "Dockerfile"
},

View File

@ -13,7 +13,7 @@
],
"rules": {
"constructor-super": "warn",
"curly": "off", // <-- glass
"curly": "off", // <-- LineMage
"eqeqeq": "warn",
"prefer-const": [
"warn",
@ -51,7 +51,7 @@
"no-var": "warn",
"jsdoc/no-types": "warn",
"semi": "off",
"@typescript-eslint/semi": "off", // <-- glass
"@typescript-eslint/semi": "off", // <-- LineMage
"@typescript-eslint/member-delimiter-style": "warn",
"@typescript-eslint/naming-convention": [
"warn",

View File

@ -93,7 +93,7 @@
}
],
"git.ignoreLimitWarning": true,
// we removed this for glass:
// we removed this for LineMage:
// "git.branchProtection": [
// "main",
// "distro",

View File

@ -23,7 +23,7 @@ Here's how you can start contributing to the extension:
`npm run install`
4. Build the project.
4. Build the project.
`npm run build`
@ -54,9 +54,9 @@ When you've made changes and want to submit them, please submit a pull request.
## What to work on
Here are the most important topics we think you can contribute.
Here are the most important topics we think you can contribute.
Feel free to contribute anything you like.
Feel free to contribute anything you like.
Full list [here]([[TODO!!!]])
@ -121,7 +121,7 @@ More ⭐'s = more important.
### Core
- Migrate the LineMage extension to live natively in VS Code. There's initial work here at `glass.contribution.ts`.
- Migrate the LineMage extension to live natively in VS Code. There's initial work here at `linemage.contribution.ts`.
- Allow access to the VS Code extension marketplace.

View File

@ -264,7 +264,7 @@ function createGitIndexVinyls(paths) {
return pall(fns, { concurrency: 4 }).then((r) => r.filter((p) => !!p));
}
// NO PRE COMMIT HOOKS!!!! for now... - glass team
// NO PRE COMMIT HOOKS!!!! for now... - LineMage team
// // this allows us to run hygiene as a git pre-commit hook
// if (require.main === module) {

View File

@ -19,7 +19,7 @@
],
"workbench": [
{
"name": "vs/workbench/contrib/glass",
"name": "vs/workbench/contrib/linemage",
"project": "vscode-workbench"
},
{

View File

@ -7,7 +7,7 @@ const fs = require('fs');
// Complete list of directories where yarn should be executed to install node modules
const dirs = [
'extensions/helloworld', // <-- glass
'extensions/linemage', // <-- linemage
'',
'build',

View File

@ -138,7 +138,7 @@ export class ApprovalCodeLensProvider implements vscode.CodeLensProvider {
console.log('diffs after added:', this._diffsOfDocument[docUriStr])
}
// called on glass.approveApproval
// called on myExtension.approveDiff
public async approveDiff({ diffid }: { diffid: number }) {
const editor = vscode.window.activeTextEditor
if (!editor)
@ -168,7 +168,7 @@ export class ApprovalCodeLensProvider implements vscode.CodeLensProvider {
}
// called on glass.discardApproval
// called on myExtension.discardDiff
public async discardDiff({ diffid }: { diffid: number }) {
const editor = vscode.window.activeTextEditor
if (!editor)
@ -180,7 +180,7 @@ export class ApprovalCodeLensProvider implements vscode.CodeLensProvider {
// get index of this diff in diffsOfDocument
const index = this._diffsOfDocument[docUriStr].findIndex(diff => diff.diffid === diffid);
if (index === -1) {
console.error('Glass error: DiffID could not be found: ', diffid, this._diffsOfDocument[docUriStr])
console.error('LineMage error: DiffID could not be found: ', diffid, this._diffsOfDocument[docUriStr])
return
}

View File

@ -15,7 +15,7 @@ export type ApiConfig = {
githubPAT: string,
repoinfo: {
remote: string, // e.g. 'github'
repository: string, // e.g. 'andrewpareles/glass_vscode'
repository: string, // e.g. 'linemagedev/linemage'
branch: string // e.g. 'main'
}
},

View File

@ -1,6 +1,6 @@
{
"nameShort": "Glass",
"nameLong": "Glass",
"nameShort": "LineMage",
"nameLong": "LineMage",
"applicationName": "code-oss",
"dataFolderName": ".vscode-oss",
"win32MutexName": "vscodeoss",

View File

@ -552,10 +552,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
},
// GLASS added this
registerGlassCtrlKProvider(selector: vscode.DocumentSelector, provider: vscode.CodeLensProvider): vscode.Disposable {
return extHostLanguageFeatures.registerCodeLensProvider(extension, checkSelector(selector), provider);
},
// LINEMAGE added this (I think will need to add this back when add ctrl+K)
// registerLineMageCtrlKProvider(selector: vscode.DocumentSelector, provider: vscode.CodeLensProvider): vscode.Disposable {
// return extHostLanguageFeatures.registerCodeLensProvider(extension, checkSelector(selector), provider);
// },
registerDefinitionProvider(selector: vscode.DocumentSelector, provider: vscode.DefinitionProvider): vscode.Disposable {

View File

@ -304,11 +304,11 @@ const newCommands: ApiCommand[] = [
})(value);
})
),
// // --- glass code lens
// // --- LineMage code lens
// new ApiCommand(
// 'vscode.executeGlassCodeLensProvider', '_executeGlassCodeLensProvider', 'Execute glass code lens provider.',
// 'vscode.executeLineMageCodeLensProvider', '_executeLineMageCodeLensProvider', 'Execute LineMage code lens provider.',
// [ApiCommandArgument.Uri, ApiCommandArgument.Number.with('itemResolveCount', 'Number of lenses that should be resolved and returned. Will only return resolved lenses, will impact performance)').optional()],
// new ApiCommandResult<languages.CodeLens[], vscode.CodeLens[] | undefined>('A promise that resolves to an array of GlassCodeLens-instances.', (value, _args, converter) => {
// new ApiCommandResult<languages.CodeLens[], vscode.CodeLens[] | undefined>('A promise that resolves to an array of LineMageCodeLens-instances.', (value, _args, converter) => {
// return tryMapWith<languages.CodeLens, vscode.CodeLens>(item => {
// return new types.CodeLens(typeConverters.Range.to(item.range), item.command && converter.fromInternal(item.command));
// })(value);

View File

@ -7,7 +7,7 @@ import {
import * as nls from 'vs/nls';
import { GlassViewPane } from 'vs/workbench/contrib/glass/browser/glassViewPane'
import { LineMageViewPane } from 'vs/workbench/contrib/linemage/browser/linemageViewPane'
import { Codicon } from 'vs/base/common/codicons';
import { localize } from 'vs/nls';
@ -18,22 +18,22 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
const glassViewIcon = registerIcon('glass-view-icon', Codicon.search, localize('glassViewIcon', 'View icon of the glass chat view.'));
const linemageViewIcon = registerIcon('linemage-view-icon', Codicon.search, localize('linemageViewIcon', 'View icon of the linemage chat view.'));
// compare against search.contribution.ts and https://app.greptile.com/chat/w1nsmt3lauwzculipycpn?repo=github%3Amain%3Amicrosoft%2Fvscode
// and debug.contribution.ts, scm.contribution.ts (source control)
const VIEW_CONTAINER_ID = 'workbench.view.glass' // called VIEWLET_ID in other places for some reason
const VIEW_CONTAINER_ID = 'workbench.view.linemage' // called VIEWLET_ID in other places for some reason
// Register view container
const viewContainerRegistry = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry);
const viewContainer = viewContainerRegistry.registerViewContainer({
id: VIEW_CONTAINER_ID,
title: nls.localize2('glass', 'Glass'), // this is used to say GLASS (Ctrl + L)
title: nls.localize2('linemage', 'LineMage'), // this is used to say LineMage (Ctrl + L)
ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [VIEW_CONTAINER_ID, { mergeViewWithContainerWhenSingleView: true }]),
hideIfEmpty: false,
icon: glassViewIcon,
icon: linemageViewIcon,
order: 1,
}, ViewContainerLocation.AuxiliaryBar, { doNotRegisterOpenCommand: true });
@ -45,10 +45,9 @@ const viewContainer = viewContainerRegistry.registerViewContainer({
const VIEW_ID = VIEW_CONTAINER_ID // not sure if we can change this
const viewDescriptor: IViewDescriptor = {
id: VIEW_ID,
containerIcon: glassViewIcon,
name: nls.localize2('glass chat', "Chat"), // this says : CHAT
// ctorDescriptor: new SyncDescriptor(GlassViewPane),
ctorDescriptor: new SyncDescriptor(GlassViewPane),
containerIcon: linemageViewIcon,
name: nls.localize2('linemage chat', "Chat"), // this says ... : CHAT
ctorDescriptor: new SyncDescriptor(LineMageViewPane),
canToggleVisibility: false,
canMoveView: true,
openCommandActionDescriptor: {

View File

@ -16,7 +16,7 @@ import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
// import { IHoverService } from 'vs/platform/hover/browser/hover';
export class GlassViewPane extends ViewPane {
export class LineMageViewPane extends ViewPane {
// constructor(
// options: IViewPaneOptions,
@ -36,4 +36,4 @@ export class GlassViewPane extends ViewPane {
}
// register a singleton service that
// register a singleton service that mounts the ViewPane here

View File

@ -3,8 +3,8 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
//#region --- glass
import 'vs/workbench/contrib/glass/browser/glass.contribution'
//#region --- linemage
import 'vs/workbench/contrib/linemage/browser/linemage.contribution'
//#endregion