Skip to content

Commit

Permalink
A bunch of small updates
Browse files Browse the repository at this point in the history
  • Loading branch information
s-and-witch committed Sep 22, 2023
1 parent d1b8c47 commit 492718f
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 23 deletions.
41 changes: 29 additions & 12 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,35 @@
// A launch configuration that launches the extension inside a new window
// A launch configuration that compiles the extension and then opens it inside a new window
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
{
"version": "0.2.0",
"configurations": [
{
"name": "Extension",
"type": "extensionHost",
"request": "launch",
"runtimeExecutable": "${execPath}",
"args": ["--extensionDevelopmentPath=${workspaceRoot}"],
"outFiles": ["${workspaceRoot}/out/**/*.js"],
"preLaunchTask": "npm: webpack"
}
]
"configurations": [
{
"name": "Run Extension",
"type": "extensionHost",
"request": "launch",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}"
],
"outFiles": [
"${workspaceFolder}/dist/**/*.js"
],
"preLaunchTask": "${defaultBuildTask}"
},
{
"name": "Extension Tests",
"type": "extensionHost",
"request": "launch",
"args": [
"--extensionDevelopmentPath=${workspaceFolder}",
"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
],
"outFiles": [
"${workspaceFolder}/out/**/*.js",
"${workspaceFolder}/dist/**/*.js"
],
"preLaunchTask": "tasks: watch-tests"
}
]
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tales language server

This is language server and vscode extension for very simple human-readable description language with file cross-linking.
This is a language server and a vscode extension for very simple human-readable description language with file cross-linking.

See `example.tl` for more information about syntax.

Expand Down
6 changes: 3 additions & 3 deletions example.tl
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
> this is highlighted

# this is seams like a comment
# this seams like a comment

keys:
are:
highlighted:
are:

/src/extension.ts -- link from the project root
./src/extension.ts -- link relative from the file
./src/extension.ts -- link relatively from the current's file folder
!keys.are.highlighted -- link to the local key
!keys..highlighted -- link to the local key with wildcard
!.are -- yet another example
!.are -- yet another example with wildcards
4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
jailbreakUnbreak = pkg:
pkgs.haskell.lib.doJailbreak (pkg.overrideAttrs (_: { meta = { }; }));

# DON'T FORGET TO PUT YOUR PACKAGE NAME HERE, REMOVING `throw`
packageName = "tale-tale";
packageName = "tales-lsp";
in {
packages.${packageName} =
haskellPackages.callCabal2nix packageName self rec {
Expand All @@ -37,6 +36,7 @@
ghcid
cabal-install
yarn
vsce
];
inputsFrom = map (__getAttr "env") (__attrValues self.packages.${system});
};
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "tale-tale",
"displayName": "tale-tale",
"name": "tales-lsp",
"displayName": "Tales LSP",
"publisher": "sand-witch",
"description": "",
"version": "0.0.1",
"engines": {
Expand All @@ -15,7 +16,7 @@
"url": "https://github.com/Player-205/tales-lsp"
},
"activationEvents": [
"onStartupFinished"
"onLanguage:tales"
],
"main": "./dist/extension",
"contributes": {
Expand Down
2 changes: 1 addition & 1 deletion src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function activate(context: any) {
const serverOptions: ServerOptions = {
run: { command: "tale-tale", transport: TransportKind.stdio },
debug: {
command: "tale-tale",
command: "tales-lsp",
transport: TransportKind.stdio,
}
};
Expand Down
2 changes: 1 addition & 1 deletion tale-tale.cabal → tales-lsp.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ extra-doc-files: CHANGELOG.md
common warnings
ghc-options: -Wall

executable tale-tale
executable tales-lsp
import: warnings
main-is: Main.hs

Expand Down

0 comments on commit 492718f

Please sign in to comment.