diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4338884..1831eb0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,13 +25,13 @@ jobs: dotnet-version: '10.0.x' - name: Restore dependencies - run: dotnet restore src/KustoLsp.Tests/KustoLspTests.csproj + run: dotnet restore src/ServerTests/ServerTests.csproj - name: Build - run: dotnet build src/KustoLsp.Tests/KustoLspTests.csproj --no-restore --configuration Release + run: dotnet build src/ServerTests/ServerTests.csproj --no-restore --configuration Release - name: Run tests - run: ./src/KustoLsp.Tests/bin/Release/net10.0/KustoLspTests + run: ./src/ServerTests/bin/Release/net10.0/ServerTests lint-typescript: name: Lint and Build (TypeScript) @@ -47,15 +47,15 @@ jobs: with: node-version: 'lts/*' cache: 'npm' - cache-dependency-path: src/VsCodeExtension/package-lock.json + cache-dependency-path: src/Client/package-lock.json - name: Install dependencies run: npm ci - working-directory: src/VsCodeExtension + working-directory: src/Client - name: Compile TypeScript run: npm run compile - working-directory: src/VsCodeExtension + working-directory: src/Client package-vsix: name: Build VSIX Package @@ -77,22 +77,22 @@ jobs: with: node-version: 'lts/*' cache: 'npm' - cache-dependency-path: src/VsCodeExtension/package-lock.json + cache-dependency-path: src/Client/package-lock.json - name: Install dependencies run: npm ci - working-directory: src/VsCodeExtension + working-directory: src/Client - name: Install vsce run: npm install -g @vscode/vsce - name: Build VSIX package run: npm run package - working-directory: src/VsCodeExtension + working-directory: src/Client - name: Upload VSIX artifact uses: actions/upload-artifact@v4 with: name: kusto-explorer-vsix - path: src/VsCodeExtension/*.vsix + path: src/Client/*.vsix retention-days: 30 diff --git a/.gitignore b/.gitignore index 20b6020..2cc8596 100644 --- a/.gitignore +++ b/.gitignore @@ -418,8 +418,8 @@ FodyWeavers.xsd *.msp # VS Code extension build output - exclude compiled server files -src/VsCodeExtension/server/ -src/VsCodeExtension/out/ -src/VsCodeExtension/LICENSE -src/VsCodeExtension/PATH.TXT +src/Client/server/ +src/Client/out/ +src/Client/LICENSE +src/Client/PATH.TXT diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ec805f9..94d6d41 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,14 +31,14 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio ### Building the Language Server ```bash -cd src/KustoLspServer +cd src/Server dotnet build ``` ### Building the VS Code Extension ```bash -cd src/VsCodeExtension +cd src/Client npm install npm run compile ``` @@ -52,7 +52,7 @@ npm run compile ### Packaging the Extension ```bash -cd src/VsCodeExtension +cd src/Client npm run package ``` @@ -60,9 +60,8 @@ This will create a `.vsix` file that can be installed in VS Code. ## Project Structure -- `src/KustoLspServer/` - .NET Language Server Protocol implementation -- `src/KustoLanguageServer/` - Core language server functionality -- `src/VsCodeExtension/` - VS Code extension (TypeScript) +- `src/Server/` - Vs Code extension Server (C#) +- `src/Client/` - VS Code extension Client (TypeScript) ## Reporting Issues diff --git a/README.md b/README.md index 96a1823..fcb893b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Kusto Language Server +# Kusto Explorer for VS Code A VS Code extension for the Kusto Query Language (KQL) @@ -108,7 +108,7 @@ A VS Code extension for the Kusto Query Language (KQL) ## Creating the VSIX installer 1. Must have vsce installed (npm install -g @vscode/vsce) -2. run `npm run package` on command line within VsCodeExtension folder to build the .vsix file +2. run `npm run package` on command line within `src/Client` folder to build the .vsix file ## Installing the VSIX manually @@ -120,37 +120,37 @@ Run `code --uninstall-extension Microsoft.kusto-explorer-vscode` on command line ## Launching in VS Code debug mode (without installing VSIX) -1. Open VsCodeExtension folder in VS Code. +1. Open `src\Client` folder in VS Code. 2. Build the client side using `compile` command in explorer panel `NPM SCRIPTS` 3. Build the server side using `build-debug-server` in explorer panel `NPM SCRIPTS` -4. Press F5 to launch the extension in a new VS Code window with debugging enabled. - -## Contributing - -This project welcomes contributions and suggestions. Please see [CONTRIBUTING.md](CONTRIBUTING.md) for details. - -This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). -For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or -contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. - -## Security - -If you believe you have found a security vulnerability in this repository, please report it to us through coordinated disclosure. - -**Please do not report security vulnerabilities through public GitHub issues.** - -Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report). - -For more information, see [SECURITY.md](SECURITY.md) or visit [Microsoft's Security Policy](https://github.com/microsoft/Kusto-Language-Server/security/policy). - -## Trademarks - -This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft -trademarks or logos is subject to and must follow -[Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general). -Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship. -Any use of third-party trademarks or logos are subject to those third-party's policies. - -## License - -This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details. +4. Press F5 to launch the extension in a new VS Code window with debugging enabled. + +## Contributing + +This project welcomes contributions and suggestions. Please see [CONTRIBUTING.md](CONTRIBUTING.md) for details. + +This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). +For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or +contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. + +## Security + +If you believe you have found a security vulnerability in this repository, please report it to us through coordinated disclosure. + +**Please do not report security vulnerabilities through public GitHub issues.** + +Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report). + +For more information, see [SECURITY.md](SECURITY.md) or visit [Microsoft's Security Policy](https://github.com/microsoft/Kusto-Language-Server/security/policy). + +## Trademarks + +This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft +trademarks or logos is subject to and must follow +[Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general). +Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship. +Any use of third-party trademarks or logos are subject to those third-party's policies. + +## License + +This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details. diff --git a/src/CONTRIBUTING.md b/src/CONTRIBUTING.md deleted file mode 100644 index ec805f9..0000000 --- a/src/CONTRIBUTING.md +++ /dev/null @@ -1,83 +0,0 @@ -# Contributing to Kusto Explorer (VS Code Extension) - -This project welcomes contributions and suggestions. Most contributions require you to agree to a -Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us -the rights to use your contribution. For details, visit https://cla.opensource.microsoft.com. - -When you submit a pull request, a CLA bot will automatically determine whether you need to provide -a CLA and decorate the PR appropriately (e.g., status check, comment). Simply follow the instructions -provided by the bot. You will only need to do this once across all repos using our CLA. - -This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). -For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or -contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. - -## How to Contribute - -1. Fork the repository -2. Create a feature branch (`git checkout -b my-feature`) -3. Make your changes -4. Run tests and ensure the build passes -5. Submit a pull request - -## Development Setup - -### Prerequisites - -- [.NET 10 SDK](https://dotnet.microsoft.com/download) -- [Node.js](https://nodejs.org/) (LTS version recommended) -- [Visual Studio Code](https://code.visualstudio.com/) - -### Building the Language Server - -```bash -cd src/KustoLspServer -dotnet build -``` - -### Building the VS Code Extension - -```bash -cd src/VsCodeExtension -npm install -npm run compile -``` - -### Running Locally - -1. Open the repository in VS Code -2. Press `F5` to launch the Extension Development Host -3. Open a `.kql` file to activate the extension - -### Packaging the Extension - -```bash -cd src/VsCodeExtension -npm run package -``` - -This will create a `.vsix` file that can be installed in VS Code. - -## Project Structure - -- `src/KustoLspServer/` - .NET Language Server Protocol implementation -- `src/KustoLanguageServer/` - Core language server functionality -- `src/VsCodeExtension/` - VS Code extension (TypeScript) - -## Reporting Issues - -Please use [GitHub Issues](https://github.com/microsoft/Kusto-Language-Server/issues) to report bugs or request features. - -When reporting a bug, please include: -- VS Code version -- Extension version -- Steps to reproduce -- Expected vs actual behavior -- Any relevant error messages from the Output panel (Kusto channel) - -## Pull Request Guidelines - -- Keep changes focused and atomic -- Follow existing code style and conventions -- Update documentation if needed -- Ensure the build passes before submitting diff --git a/src/VsCodeExtension/.vscode/launch.json b/src/Client/.vscode/launch.json similarity index 100% rename from src/VsCodeExtension/.vscode/launch.json rename to src/Client/.vscode/launch.json diff --git a/src/VsCodeExtension/.vscode/settings.json b/src/Client/.vscode/settings.json similarity index 100% rename from src/VsCodeExtension/.vscode/settings.json rename to src/Client/.vscode/settings.json diff --git a/src/VsCodeExtension/.vscodeignore b/src/Client/.vscodeignore similarity index 100% rename from src/VsCodeExtension/.vscodeignore rename to src/Client/.vscodeignore diff --git a/src/VsCodeExtension/VsCodeExtension.esproj b/src/Client/Client.esproj similarity index 100% rename from src/VsCodeExtension/VsCodeExtension.esproj rename to src/Client/Client.esproj diff --git a/src/VsCodeExtension/README.md b/src/Client/README.md similarity index 100% rename from src/VsCodeExtension/README.md rename to src/Client/README.md diff --git a/src/VsCodeExtension/eslint.config.js b/src/Client/eslint.config.js similarity index 100% rename from src/VsCodeExtension/eslint.config.js rename to src/Client/eslint.config.js diff --git a/src/VsCodeExtension/extension.ts b/src/Client/extension.ts similarity index 100% rename from src/VsCodeExtension/extension.ts rename to src/Client/extension.ts diff --git a/src/VsCodeExtension/features/chartPanel.ts b/src/Client/features/chartPanel.ts similarity index 100% rename from src/VsCodeExtension/features/chartPanel.ts rename to src/Client/features/chartPanel.ts diff --git a/src/VsCodeExtension/features/clientStorage.ts b/src/Client/features/clientStorage.ts similarity index 100% rename from src/VsCodeExtension/features/clientStorage.ts rename to src/Client/features/clientStorage.ts diff --git a/src/VsCodeExtension/features/clipboard.ts b/src/Client/features/clipboard.ts similarity index 100% rename from src/VsCodeExtension/features/clipboard.ts rename to src/Client/features/clipboard.ts diff --git a/src/VsCodeExtension/features/completion.ts b/src/Client/features/completion.ts similarity index 100% rename from src/VsCodeExtension/features/completion.ts rename to src/Client/features/completion.ts diff --git a/src/VsCodeExtension/features/connectionStatusBar.ts b/src/Client/features/connectionStatusBar.ts similarity index 100% rename from src/VsCodeExtension/features/connectionStatusBar.ts rename to src/Client/features/connectionStatusBar.ts diff --git a/src/VsCodeExtension/features/connections.ts b/src/Client/features/connections.ts similarity index 100% rename from src/VsCodeExtension/features/connections.ts rename to src/Client/features/connections.ts diff --git a/src/VsCodeExtension/features/connectionsPanel.ts b/src/Client/features/connectionsPanel.ts similarity index 100% rename from src/VsCodeExtension/features/connectionsPanel.ts rename to src/Client/features/connectionsPanel.ts diff --git a/src/VsCodeExtension/features/copilot.ts b/src/Client/features/copilot.ts similarity index 100% rename from src/VsCodeExtension/features/copilot.ts rename to src/Client/features/copilot.ts diff --git a/src/VsCodeExtension/features/documentPanels.ts b/src/Client/features/documentPanels.ts similarity index 100% rename from src/VsCodeExtension/features/documentPanels.ts rename to src/Client/features/documentPanels.ts diff --git a/src/VsCodeExtension/features/dotnet.ts b/src/Client/features/dotnet.ts similarity index 100% rename from src/VsCodeExtension/features/dotnet.ts rename to src/Client/features/dotnet.ts diff --git a/src/VsCodeExtension/features/entityDefinitionProvider.ts b/src/Client/features/entityDefinitionProvider.ts similarity index 100% rename from src/VsCodeExtension/features/entityDefinitionProvider.ts rename to src/Client/features/entityDefinitionProvider.ts diff --git a/src/VsCodeExtension/features/html.ts b/src/Client/features/html.ts similarity index 100% rename from src/VsCodeExtension/features/html.ts rename to src/Client/features/html.ts diff --git a/src/VsCodeExtension/features/markdown.ts b/src/Client/features/markdown.ts similarity index 100% rename from src/VsCodeExtension/features/markdown.ts rename to src/Client/features/markdown.ts diff --git a/src/VsCodeExtension/features/resultsCache.ts b/src/Client/features/resultsCache.ts similarity index 100% rename from src/VsCodeExtension/features/resultsCache.ts rename to src/Client/features/resultsCache.ts diff --git a/src/VsCodeExtension/features/resultsEditor.ts b/src/Client/features/resultsEditor.ts similarity index 100% rename from src/VsCodeExtension/features/resultsEditor.ts rename to src/Client/features/resultsEditor.ts diff --git a/src/VsCodeExtension/features/resultsPanel.ts b/src/Client/features/resultsPanel.ts similarity index 100% rename from src/VsCodeExtension/features/resultsPanel.ts rename to src/Client/features/resultsPanel.ts diff --git a/src/VsCodeExtension/features/schemaCache.ts b/src/Client/features/schemaCache.ts similarity index 100% rename from src/VsCodeExtension/features/schemaCache.ts rename to src/Client/features/schemaCache.ts diff --git a/src/VsCodeExtension/features/server.ts b/src/Client/features/server.ts similarity index 100% rename from src/VsCodeExtension/features/server.ts rename to src/Client/features/server.ts diff --git a/src/VsCodeExtension/images/kusto_explorer.png b/src/Client/images/kusto_explorer.png similarity index 100% rename from src/VsCodeExtension/images/kusto_explorer.png rename to src/Client/images/kusto_explorer.png diff --git a/src/VsCodeExtension/instructions.md b/src/Client/instructions.md similarity index 100% rename from src/VsCodeExtension/instructions.md rename to src/Client/instructions.md diff --git a/src/VsCodeExtension/package-lock.json b/src/Client/package-lock.json similarity index 100% rename from src/VsCodeExtension/package-lock.json rename to src/Client/package-lock.json diff --git a/src/VsCodeExtension/package.json b/src/Client/package.json similarity index 97% rename from src/VsCodeExtension/package.json rename to src/Client/package.json index 2bccae9..209a65c 100644 --- a/src/VsCodeExtension/package.json +++ b/src/Client/package.json @@ -23,8 +23,8 @@ "scripts": { "compile": "tsc -p .", "watch": "tsc -watch -p .", - "build-release-server": "dotnet publish ../KustoLspServer/KustoLspServer.csproj -c Release -o ./server", - "build-debug-server": "dotnet publish ../KustoLspServer/KustoLspServer.csproj -c Debug -o ./server", + "build-release-server": "dotnet publish ../Server/Server.csproj -c Release -o ./server", + "build-debug-server": "dotnet publish ../Server/Server.csproj -c Debug -o ./server", "package": "shx cp ../../LICENSE . && npm run compile && npm run build-release-server && vsce package", "publish": "vsce publish" }, diff --git a/src/VsCodeExtension/settings.txt b/src/Client/settings.txt similarity index 100% rename from src/VsCodeExtension/settings.txt rename to src/Client/settings.txt diff --git a/src/VsCodeExtension/syntaxes/kusto.tmLanguage.json b/src/Client/syntaxes/kusto.tmLanguage.json similarity index 100% rename from src/VsCodeExtension/syntaxes/kusto.tmLanguage.json rename to src/Client/syntaxes/kusto.tmLanguage.json diff --git a/src/VsCodeExtension/tsconfig.json b/src/Client/tsconfig.json similarity index 100% rename from src/VsCodeExtension/tsconfig.json rename to src/Client/tsconfig.json diff --git a/src/Kusto.LSP.slnx b/src/Kusto.LSP.slnx deleted file mode 100644 index ea60109..0000000 --- a/src/Kusto.LSP.slnx +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/KustoExplorerVscode.slnx b/src/KustoExplorerVscode.slnx new file mode 100644 index 0000000..6ced67b --- /dev/null +++ b/src/KustoExplorerVscode.slnx @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/KustoLspServer/KustoLspServer.csproj b/src/KustoLspServer/KustoLspServer.csproj deleted file mode 100644 index 797aa8f..0000000 --- a/src/KustoLspServer/KustoLspServer.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - Exe - net10.0 - enable - enable - - - - - - - - diff --git a/src/LspCommon/LspCommon.csproj b/src/LspCommon/LspCommon.csproj deleted file mode 100644 index 00e548d..0000000 --- a/src/LspCommon/LspCommon.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - net10.0 - enable - enable - - - - - - - - diff --git a/src/KustoLanguageServer/Charting/ChartConstants.cs b/src/Server/Charting/ChartConstants.cs similarity index 95% rename from src/KustoLanguageServer/Charting/ChartConstants.cs rename to src/Server/Charting/ChartConstants.cs index dc0ee83..2b16d1b 100644 --- a/src/KustoLanguageServer/Charting/ChartConstants.cs +++ b/src/Server/Charting/ChartConstants.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// Constants for chart visualization kinds. diff --git a/src/KustoLanguageServer/Charting/ChartOptions.cs b/src/Server/Charting/ChartOptions.cs similarity index 96% rename from src/KustoLanguageServer/Charting/ChartOptions.cs rename to src/Server/Charting/ChartOptions.cs index e2c7e36..f21e12a 100644 --- a/src/KustoLanguageServer/Charting/ChartOptions.cs +++ b/src/Server/Charting/ChartOptions.cs @@ -5,7 +5,7 @@ using System.Runtime.Serialization; using Kusto.Data.Utils; -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// Serializable representation of chart visualization options. diff --git a/src/KustoLanguageServer/Charting/IChartManager.cs b/src/Server/Charting/IChartManager.cs similarity index 81% rename from src/KustoLanguageServer/Charting/IChartManager.cs rename to src/Server/Charting/IChartManager.cs index d9bb585..9970667 100644 --- a/src/KustoLanguageServer/Charting/IChartManager.cs +++ b/src/Server/Charting/IChartManager.cs @@ -1,9 +1,9 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Data; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public interface IChartManager { diff --git a/src/KustoLanguageServer/Charting/PlotlyChartBuilder.cs b/src/Server/Charting/PlotlyChartBuilder.cs similarity index 99% rename from src/KustoLanguageServer/Charting/PlotlyChartBuilder.cs rename to src/Server/Charting/PlotlyChartBuilder.cs index c4955b1..97536e7 100644 --- a/src/KustoLanguageServer/Charting/PlotlyChartBuilder.cs +++ b/src/Server/Charting/PlotlyChartBuilder.cs @@ -2,7 +2,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// Immutable fluent builder for creating Plotly charts with C# idioms. diff --git a/src/KustoLanguageServer/Charting/PlotlyChartExtensions.cs b/src/Server/Charting/PlotlyChartExtensions.cs similarity index 99% rename from src/KustoLanguageServer/Charting/PlotlyChartExtensions.cs rename to src/Server/Charting/PlotlyChartExtensions.cs index ff267b8..2b367cd 100644 --- a/src/KustoLanguageServer/Charting/PlotlyChartExtensions.cs +++ b/src/Server/Charting/PlotlyChartExtensions.cs @@ -1,4 +1,4 @@ -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// Extension methods for building charts with fluent syntax. @@ -560,7 +560,7 @@ public static PlotlyChartBuilder SetGrouped(this PlotlyChartBuilder builder) /// Sets the title for the 2D X-axis. /// /// The chart builder instance. - /// The axis title text (e.g., "Time", "Region", "Temperature (°C)"). + /// The axis title text (e.g., "Time", "Region", "Temperature (�C)"). /// A new immutable PlotlyChartBuilder with the X-axis title set. public static PlotlyChartBuilder SetXAxisTitle(this PlotlyChartBuilder builder, string title) { diff --git a/src/KustoLanguageServer/Charting/PlotlyChartManager.cs b/src/Server/Charting/PlotlyChartManager.cs similarity index 99% rename from src/KustoLanguageServer/Charting/PlotlyChartManager.cs rename to src/Server/Charting/PlotlyChartManager.cs index 6660942..4d101f2 100644 --- a/src/KustoLanguageServer/Charting/PlotlyChartManager.cs +++ b/src/Server/Charting/PlotlyChartManager.cs @@ -5,7 +5,7 @@ using System.Text.Json; using System.Text.Json.Nodes; -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// Plotly-based implementation of IChartManager using immutable PlotlyChartBuilder. diff --git a/src/KustoLanguageServer/Charting/PlotlyConstants.cs b/src/Server/Charting/PlotlyConstants.cs similarity index 97% rename from src/KustoLanguageServer/Charting/PlotlyConstants.cs rename to src/Server/Charting/PlotlyConstants.cs index c7bbaa8..8e62208 100644 --- a/src/KustoLanguageServer/Charting/PlotlyConstants.cs +++ b/src/Server/Charting/PlotlyConstants.cs @@ -1,4 +1,4 @@ -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// Hover interaction modes for Plotly charts. diff --git a/src/KustoLanguageServer/Charting/PlotlyHtmlHelper.cs b/src/Server/Charting/PlotlyHtmlHelper.cs similarity index 99% rename from src/KustoLanguageServer/Charting/PlotlyHtmlHelper.cs rename to src/Server/Charting/PlotlyHtmlHelper.cs index 825a914..1dfeb50 100644 --- a/src/KustoLanguageServer/Charting/PlotlyHtmlHelper.cs +++ b/src/Server/Charting/PlotlyHtmlHelper.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// Helper for creating complete HTML documents with Plotly charts. diff --git a/src/KustoLanguageServer/Connections/ConnectionManager.cs b/src/Server/Connections/ConnectionManager.cs similarity index 97% rename from src/KustoLanguageServer/Connections/ConnectionManager.cs rename to src/Server/Connections/ConnectionManager.cs index 703bb37..66e35ef 100644 --- a/src/KustoLanguageServer/Connections/ConnectionManager.cs +++ b/src/Server/Connections/ConnectionManager.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Cloud.Platform.Data; @@ -14,7 +14,7 @@ using System.Data; using System.Diagnostics.CodeAnalysis; -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// Keeps track of connections to servers and databases, to allow reuse of instances. diff --git a/src/KustoLanguageServer/Connections/IConnection.cs b/src/Server/Connections/IConnection.cs similarity index 97% rename from src/KustoLanguageServer/Connections/IConnection.cs rename to src/Server/Connections/IConnection.cs index 23e20c1..b4f10f9 100644 --- a/src/KustoLanguageServer/Connections/IConnection.cs +++ b/src/Server/Connections/IConnection.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Collections.Immutable; @@ -7,7 +7,7 @@ using Kusto.Language; using Kusto.Language.Editor; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public interface IConnection { diff --git a/src/KustoLanguageServer/Connections/IConnectionManager.cs b/src/Server/Connections/IConnectionManager.cs similarity index 93% rename from src/KustoLanguageServer/Connections/IConnectionManager.cs rename to src/Server/Connections/IConnectionManager.cs index b187e34..aeef9d8 100644 --- a/src/KustoLanguageServer/Connections/IConnectionManager.cs +++ b/src/Server/Connections/IConnectionManager.cs @@ -1,9 +1,9 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Diagnostics.CodeAnalysis; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public interface IConnectionManager { diff --git a/src/KustoLanguageServer/Diagnostics/DiagnosticsManager.cs b/src/Server/Diagnostics/DiagnosticsManager.cs similarity index 95% rename from src/KustoLanguageServer/Diagnostics/DiagnosticsManager.cs rename to src/Server/Diagnostics/DiagnosticsManager.cs index 06500bd..eefa868 100644 --- a/src/KustoLanguageServer/Diagnostics/DiagnosticsManager.cs +++ b/src/Server/Diagnostics/DiagnosticsManager.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Collections.Immutable; @@ -6,7 +6,7 @@ using Kusto.Language; using Kusto.Language.Editor; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public record DiagnosticInfo(Uri Id, string Text, ImmutableList Diagnostics); diff --git a/src/KustoLanguageServer/Diagnostics/IDiagnosticsManager.cs b/src/Server/Diagnostics/IDiagnosticsManager.cs similarity index 77% rename from src/KustoLanguageServer/Diagnostics/IDiagnosticsManager.cs rename to src/Server/Diagnostics/IDiagnosticsManager.cs index 574d748..ea0c3c5 100644 --- a/src/KustoLanguageServer/Diagnostics/IDiagnosticsManager.cs +++ b/src/Server/Diagnostics/IDiagnosticsManager.cs @@ -1,7 +1,7 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Kusto.Lsp; +namespace Kusto.Vscode; public interface IDiagnosticsManager { diff --git a/src/KustoLanguageServer/Documents/DocumentManager.cs b/src/Server/Documents/DocumentManager.cs similarity index 97% rename from src/KustoLanguageServer/Documents/DocumentManager.cs rename to src/Server/Documents/DocumentManager.cs index bd6d699..7bb878a 100644 --- a/src/KustoLanguageServer/Documents/DocumentManager.cs +++ b/src/Server/Documents/DocumentManager.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Language.Editor; @@ -6,7 +6,7 @@ using System.Collections.Immutable; using System.Diagnostics.CodeAnalysis; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public class DocumentManager : IDocumentManager { diff --git a/src/KustoLanguageServer/Documents/IDocument.cs b/src/Server/Documents/IDocument.cs similarity index 97% rename from src/KustoLanguageServer/Documents/IDocument.cs rename to src/Server/Documents/IDocument.cs index 7cadc9e..40a7d25 100644 --- a/src/KustoLanguageServer/Documents/IDocument.cs +++ b/src/Server/Documents/IDocument.cs @@ -7,7 +7,7 @@ using Kusto.Language.Editor; using Kusto.Language.Symbols; -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// A Kusto document, represents the query text and the associated operations for providing intellisense and other editor services. diff --git a/src/KustoLanguageServer/Documents/IDocumentManager.cs b/src/Server/Documents/IDocumentManager.cs similarity index 94% rename from src/KustoLanguageServer/Documents/IDocumentManager.cs rename to src/Server/Documents/IDocumentManager.cs index 7ce977e..461aa19 100644 --- a/src/KustoLanguageServer/Documents/IDocumentManager.cs +++ b/src/Server/Documents/IDocumentManager.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Collections.Immutable; using System.Diagnostics.CodeAnalysis; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public interface IDocumentManager { diff --git a/src/KustoLanguageServer/Documents/SectionedDocument.cs b/src/Server/Documents/SectionedDocument.cs similarity index 97% rename from src/KustoLanguageServer/Documents/SectionedDocument.cs rename to src/Server/Documents/SectionedDocument.cs index 59946fe..c1e3530 100644 --- a/src/KustoLanguageServer/Documents/SectionedDocument.cs +++ b/src/Server/Documents/SectionedDocument.cs @@ -8,7 +8,7 @@ using Kusto.Language.Editor; using Kusto.Language.Symbols; -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// A Kusto document that contains multiple query sections separated by blank lines. diff --git a/src/KustoLanguageServer/Entities/EntityManager.cs b/src/Server/Entities/EntityManager.cs similarity index 96% rename from src/KustoLanguageServer/Entities/EntityManager.cs rename to src/Server/Entities/EntityManager.cs index 638ebbb..7cf816f 100644 --- a/src/KustoLanguageServer/Entities/EntityManager.cs +++ b/src/Server/Entities/EntityManager.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Data.Common; using Kusto.Language; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public class EntityManager : IEntityManager { diff --git a/src/KustoLanguageServer/Entities/IEntityManager.cs b/src/Server/Entities/IEntityManager.cs similarity index 93% rename from src/KustoLanguageServer/Entities/IEntityManager.cs rename to src/Server/Entities/IEntityManager.cs index 44c7d41..b79f464 100644 --- a/src/KustoLanguageServer/Entities/IEntityManager.cs +++ b/src/Server/Entities/IEntityManager.cs @@ -1,9 +1,9 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Data.Common; -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// Provides information about entities beyond what the provides. diff --git a/src/KustoLanguageServer/Logging/ILogger.cs b/src/Server/Logging/ILogger.cs similarity index 57% rename from src/KustoLanguageServer/Logging/ILogger.cs rename to src/Server/Logging/ILogger.cs index 084a512..ffc6066 100644 --- a/src/KustoLanguageServer/Logging/ILogger.cs +++ b/src/Server/Logging/ILogger.cs @@ -1,7 +1,7 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Kusto.Lsp; +namespace Kusto.Vscode; public interface ILogger { diff --git a/src/LspCommon/LspExtensions.cs b/src/Server/Lsp/LspExtensions.cs similarity index 100% rename from src/LspCommon/LspExtensions.cs rename to src/Server/Lsp/LspExtensions.cs diff --git a/src/LspCommon/LspServer.cs b/src/Server/Lsp/LspServer.cs similarity index 100% rename from src/LspCommon/LspServer.cs rename to src/Server/Lsp/LspServer.cs diff --git a/src/LspCommon/SemanticTokenEncoder.cs b/src/Server/Lsp/SemanticTokenEncoder.cs similarity index 100% rename from src/LspCommon/SemanticTokenEncoder.cs rename to src/Server/Lsp/SemanticTokenEncoder.cs diff --git a/src/KustoLspServer/Program.cs b/src/Server/Program.cs similarity index 78% rename from src/KustoLspServer/Program.cs rename to src/Server/Program.cs index 152ee46..1901cff 100644 --- a/src/KustoLspServer/Program.cs +++ b/src/Server/Program.cs @@ -1,8 +1,8 @@  -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -var server = new Kusto.Lsp.KustoLspServer( +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT license. + +var server = new Kusto.Vscode.Server( Console.OpenStandardInput(), Console.OpenStandardOutput(), args diff --git a/src/KustoLanguageServer/Querying/IQueryManager.cs b/src/Server/Querying/IQueryManager.cs similarity index 94% rename from src/KustoLanguageServer/Querying/IQueryManager.cs rename to src/Server/Querying/IQueryManager.cs index 7cd930b..3b5bb1d 100644 --- a/src/KustoLanguageServer/Querying/IQueryManager.cs +++ b/src/Server/Querying/IQueryManager.cs @@ -1,11 +1,11 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Collections.Immutable; using Kusto.Language; using Kusto.Language.Editor; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public interface IQueryManager { diff --git a/src/KustoLanguageServer/Querying/QueryManager.cs b/src/Server/Querying/QueryManager.cs similarity index 96% rename from src/KustoLanguageServer/Querying/QueryManager.cs rename to src/Server/Querying/QueryManager.cs index 448f33c..60f3840 100644 --- a/src/KustoLanguageServer/Querying/QueryManager.cs +++ b/src/Server/Querying/QueryManager.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Data; @@ -8,7 +8,7 @@ using Kusto.Language.Symbols; using System.Collections.Immutable; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public class QueryManager : IQueryManager { diff --git a/src/KustoLanguageServer/Schema/ISchemaManager.cs b/src/Server/Schema/ISchemaManager.cs similarity index 91% rename from src/KustoLanguageServer/Schema/ISchemaManager.cs rename to src/Server/Schema/ISchemaManager.cs index ab8ade6..caecb4a 100644 --- a/src/KustoLanguageServer/Schema/ISchemaManager.cs +++ b/src/Server/Schema/ISchemaManager.cs @@ -1,7 +1,7 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Kusto.Lsp; +namespace Kusto.Vscode; public interface ISchemaManager : ISchemaSource { diff --git a/src/KustoLanguageServer/Schema/ISchemaSource.cs b/src/Server/Schema/ISchemaSource.cs similarity index 96% rename from src/KustoLanguageServer/Schema/ISchemaSource.cs rename to src/Server/Schema/ISchemaSource.cs index c5a15c6..6e909d8 100644 --- a/src/KustoLanguageServer/Schema/ISchemaSource.cs +++ b/src/Server/Schema/ISchemaSource.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Collections.Immutable; using System.Runtime.Serialization; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public interface ISchemaSource { diff --git a/src/KustoLanguageServer/Schema/SchemaManager.cs b/src/Server/Schema/SchemaManager.cs similarity index 97% rename from src/KustoLanguageServer/Schema/SchemaManager.cs rename to src/Server/Schema/SchemaManager.cs index f4912e4..d2d4303 100644 --- a/src/KustoLanguageServer/Schema/SchemaManager.cs +++ b/src/Server/Schema/SchemaManager.cs @@ -1,9 +1,9 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Collections.Immutable; -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// A cached schema source. diff --git a/src/KustoLanguageServer/Schema/ServerSchemaSource.cs b/src/Server/Schema/ServerSchemaSource.cs similarity index 97% rename from src/KustoLanguageServer/Schema/ServerSchemaSource.cs rename to src/Server/Schema/ServerSchemaSource.cs index ffee1c9..39dfeca 100644 --- a/src/KustoLanguageServer/Schema/ServerSchemaSource.cs +++ b/src/Server/Schema/ServerSchemaSource.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Data; @@ -8,7 +8,7 @@ using Newtonsoft.Json; using System.Collections.Immutable; -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// A that pulls schema direct from the server. diff --git a/src/KustoLanguageServer/KustoLspServer.cs b/src/Server/Server.cs similarity index 97% rename from src/KustoLanguageServer/KustoLspServer.cs rename to src/Server/Server.cs index 6e2bc38..e41c132 100644 --- a/src/KustoLanguageServer/KustoLspServer.cs +++ b/src/Server/Server.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Collections.Immutable; @@ -14,9 +14,9 @@ using Kusto.Language.Symbols; using Lsp.Common; -namespace Kusto.Lsp; +namespace Kusto.Vscode; -public class KustoLspServer : LspServer, ILogger, ISettingSource, IStorage +public class Server : LspServer, ILogger, ISettingSource, IStorage { private readonly ILogger _logger; private readonly ISettingSource _settingSource; @@ -32,7 +32,7 @@ public class KustoLspServer : LspServer, ILogger, ISettingSource, IStorage private readonly IEntityManager _entityManager; private readonly ImmutableList _args; - public KustoLspServer( + public Server( Stream input, Stream output, string[] args, @@ -63,7 +63,7 @@ public KustoLspServer( InitEvents(); } - public KustoLspServer( + public Server( Stream input, Stream output, string[] args) diff --git a/src/KustoLanguageServer/KustoLsp.csproj b/src/Server/Server.csproj similarity index 85% rename from src/KustoLanguageServer/KustoLsp.csproj rename to src/Server/Server.csproj index 47739f1..84b8bcb 100644 --- a/src/KustoLanguageServer/KustoLsp.csproj +++ b/src/Server/Server.csproj @@ -4,6 +4,7 @@ net10.0 enable enable + Exe @@ -16,10 +17,7 @@ - - - - + diff --git a/src/KustoLanguageServer/Settings/ConnectionSettings.cs b/src/Server/Settings/ConnectionSettings.cs similarity index 81% rename from src/KustoLanguageServer/Settings/ConnectionSettings.cs rename to src/Server/Settings/ConnectionSettings.cs index cbd9953..fea6425 100644 --- a/src/KustoLanguageServer/Settings/ConnectionSettings.cs +++ b/src/Server/Settings/ConnectionSettings.cs @@ -1,9 +1,9 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Collections.Immutable; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public class ConnectionSettings { diff --git a/src/KustoLanguageServer/Settings/FormatSettings.cs b/src/Server/Settings/FormatSettings.cs similarity index 96% rename from src/KustoLanguageServer/Settings/FormatSettings.cs rename to src/Server/Settings/FormatSettings.cs index a6585ab..f5cc459 100644 --- a/src/KustoLanguageServer/Settings/FormatSettings.cs +++ b/src/Server/Settings/FormatSettings.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Collections.Immutable; using Kusto.Language.Editor; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public static class FormatSettings { diff --git a/src/KustoLanguageServer/Settings/IOptionsManager.cs b/src/Server/Settings/IOptionsManager.cs similarity index 87% rename from src/KustoLanguageServer/Settings/IOptionsManager.cs rename to src/Server/Settings/IOptionsManager.cs index 6a96799..66c6d60 100644 --- a/src/KustoLanguageServer/Settings/IOptionsManager.cs +++ b/src/Server/Settings/IOptionsManager.cs @@ -1,9 +1,9 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Language.Editor; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public interface IOptionsManager { diff --git a/src/KustoLanguageServer/Settings/ISettingSource.cs b/src/Server/Settings/ISettingSource.cs similarity index 89% rename from src/KustoLanguageServer/Settings/ISettingSource.cs rename to src/Server/Settings/ISettingSource.cs index bada695..ddbc08a 100644 --- a/src/KustoLanguageServer/Settings/ISettingSource.cs +++ b/src/Server/Settings/ISettingSource.cs @@ -1,9 +1,9 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Collections.Immutable; -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// A source of settings. diff --git a/src/KustoLanguageServer/Settings/OptionsManager.cs b/src/Server/Settings/OptionsManager.cs similarity index 96% rename from src/KustoLanguageServer/Settings/OptionsManager.cs rename to src/Server/Settings/OptionsManager.cs index a095f1b..83b553f 100644 --- a/src/KustoLanguageServer/Settings/OptionsManager.cs +++ b/src/Server/Settings/OptionsManager.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Language; using KLE=Kusto.Language.Editor; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public class OptionsManager : IOptionsManager { diff --git a/src/KustoLanguageServer/Settings/Setting.cs b/src/Server/Settings/Setting.cs similarity index 94% rename from src/KustoLanguageServer/Settings/Setting.cs rename to src/Server/Settings/Setting.cs index ebf6529..0ba797e 100644 --- a/src/KustoLanguageServer/Settings/Setting.cs +++ b/src/Server/Settings/Setting.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Newtonsoft.Json.Linq; using System.Collections.Immutable; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public abstract class Setting { diff --git a/src/KustoLanguageServer/Storage/IStorage.cs b/src/Server/Storage/IStorage.cs similarity index 91% rename from src/KustoLanguageServer/Storage/IStorage.cs rename to src/Server/Storage/IStorage.cs index cbead20..102304d 100644 --- a/src/KustoLanguageServer/Storage/IStorage.cs +++ b/src/Server/Storage/IStorage.cs @@ -1,5 +1,5 @@ - -namespace Kusto.Lsp; + +namespace Kusto.Vscode; /// /// A fast persistent key-value store diff --git a/src/KustoLanguageServer/Symbols/ISymbolManager.cs b/src/Server/Symbols/ISymbolManager.cs similarity index 94% rename from src/KustoLanguageServer/Symbols/ISymbolManager.cs rename to src/Server/Symbols/ISymbolManager.cs index 8593897..2e9c195 100644 --- a/src/KustoLanguageServer/Symbols/ISymbolManager.cs +++ b/src/Server/Symbols/ISymbolManager.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Language; using System.Collections.Immutable; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public interface ISymbolManager { diff --git a/src/KustoLanguageServer/Symbols/SymbolManager.cs b/src/Server/Symbols/SymbolManager.cs similarity index 97% rename from src/KustoLanguageServer/Symbols/SymbolManager.cs rename to src/Server/Symbols/SymbolManager.cs index ffa6c30..c614422 100644 --- a/src/KustoLanguageServer/Symbols/SymbolManager.cs +++ b/src/Server/Symbols/SymbolManager.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Language; @@ -6,7 +6,7 @@ using Kusto.Language.Symbols; using System.Collections.Immutable; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public class SymbolManager : ISymbolManager { diff --git a/src/KustoLanguageServer/Utilities/ClientDirectiveExtensions.cs b/src/Server/Utilities/ClientDirectiveExtensions.cs similarity index 95% rename from src/KustoLanguageServer/Utilities/ClientDirectiveExtensions.cs rename to src/Server/Utilities/ClientDirectiveExtensions.cs index 8257bca..21d8de5 100644 --- a/src/KustoLanguageServer/Utilities/ClientDirectiveExtensions.cs +++ b/src/Server/Utilities/ClientDirectiveExtensions.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Data; @@ -6,7 +6,7 @@ using Kusto.Language.Editor; using System.Collections.Immutable; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public static class ClientDirectiveExtensions { diff --git a/src/KustoLanguageServer/Utilities/ConnectionFacts.cs b/src/Server/Utilities/ConnectionFacts.cs similarity index 91% rename from src/KustoLanguageServer/Utilities/ConnectionFacts.cs rename to src/Server/Utilities/ConnectionFacts.cs index 63eb610..ca85eec 100644 --- a/src/KustoLanguageServer/Utilities/ConnectionFacts.cs +++ b/src/Server/Utilities/ConnectionFacts.cs @@ -1,8 +1,8 @@ -using Kusto.Language; +using Kusto.Language; // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Kusto.Lsp; +namespace Kusto.Vscode; public static class ConnectionFacts { diff --git a/src/KustoLanguageServer/Utilities/DeclarationFinder.cs b/src/Server/Utilities/DeclarationFinder.cs similarity index 95% rename from src/KustoLanguageServer/Utilities/DeclarationFinder.cs rename to src/Server/Utilities/DeclarationFinder.cs index f8a22d8..e2caa69 100644 --- a/src/KustoLanguageServer/Utilities/DeclarationFinder.cs +++ b/src/Server/Utilities/DeclarationFinder.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Language; @@ -8,7 +8,7 @@ using System.Collections.Immutable; using System.Diagnostics.CodeAnalysis; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public static class DeclarationFinder { diff --git a/src/KustoLanguageServer/Utilities/ErrorDecoder.cs b/src/Server/Utilities/ErrorDecoder.cs similarity index 97% rename from src/KustoLanguageServer/Utilities/ErrorDecoder.cs rename to src/Server/Utilities/ErrorDecoder.cs index 20240f4..693837e 100644 --- a/src/KustoLanguageServer/Utilities/ErrorDecoder.cs +++ b/src/Server/Utilities/ErrorDecoder.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Cloud.Platform.Utils; @@ -8,7 +8,7 @@ using System.Diagnostics.CodeAnalysis; using System.Text.RegularExpressions; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public class ErrorDecoder { diff --git a/src/KustoLanguageServer/Utilities/GraphModel.cs b/src/Server/Utilities/GraphModel.cs similarity index 94% rename from src/KustoLanguageServer/Utilities/GraphModel.cs rename to src/Server/Utilities/GraphModel.cs index e0b6b79..7e92028 100644 --- a/src/KustoLanguageServer/Utilities/GraphModel.cs +++ b/src/Server/Utilities/GraphModel.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace Kusto.Lsp; +namespace Kusto.Vscode; #nullable disable public class GraphModel diff --git a/src/KustoLanguageServer/Utilities/HtmlBuilder.cs b/src/Server/Utilities/HtmlBuilder.cs similarity index 95% rename from src/KustoLanguageServer/Utilities/HtmlBuilder.cs rename to src/Server/Utilities/HtmlBuilder.cs index 6b988d5..2ff16b8 100644 --- a/src/KustoLanguageServer/Utilities/HtmlBuilder.cs +++ b/src/Server/Utilities/HtmlBuilder.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Data; using System.Reflection; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public class HtmlBuilder : TextBuilder { diff --git a/src/KustoLanguageServer/Utilities/InfoToSymbolExtensions.cs b/src/Server/Utilities/InfoToSymbolExtensions.cs similarity index 95% rename from src/KustoLanguageServer/Utilities/InfoToSymbolExtensions.cs rename to src/Server/Utilities/InfoToSymbolExtensions.cs index bfd6f4d..99e381d 100644 --- a/src/KustoLanguageServer/Utilities/InfoToSymbolExtensions.cs +++ b/src/Server/Utilities/InfoToSymbolExtensions.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Language.Symbols; using System.Collections.Immutable; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public static class InfoToSymbolExtensions { diff --git a/src/KustoLanguageServer/Utilities/KqlBuilder.cs b/src/Server/Utilities/KqlBuilder.cs similarity index 96% rename from src/KustoLanguageServer/Utilities/KqlBuilder.cs rename to src/Server/Utilities/KqlBuilder.cs index fa7399e..07ba75c 100644 --- a/src/KustoLanguageServer/Utilities/KqlBuilder.cs +++ b/src/Server/Utilities/KqlBuilder.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Language; @@ -8,7 +8,7 @@ using Newtonsoft.Json.Linq; using System.Collections.Immutable; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public class KqlBuilder : TextBuilder { diff --git a/src/KustoLanguageServer/Utilities/KustoCodeExtensions.cs b/src/Server/Utilities/KustoCodeExtensions.cs similarity index 94% rename from src/KustoLanguageServer/Utilities/KustoCodeExtensions.cs rename to src/Server/Utilities/KustoCodeExtensions.cs index a0e2fb9..e563539 100644 --- a/src/KustoLanguageServer/Utilities/KustoCodeExtensions.cs +++ b/src/Server/Utilities/KustoCodeExtensions.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Language; using Kusto.Language.Syntax; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public static class KustoCodeExtensions { diff --git a/src/KustoLanguageServer/Utilities/KustoCodeServiceExtensions.cs b/src/Server/Utilities/KustoCodeServiceExtensions.cs similarity index 95% rename from src/KustoLanguageServer/Utilities/KustoCodeServiceExtensions.cs rename to src/Server/Utilities/KustoCodeServiceExtensions.cs index acfb94c..27f5955 100644 --- a/src/KustoLanguageServer/Utilities/KustoCodeServiceExtensions.cs +++ b/src/Server/Utilities/KustoCodeServiceExtensions.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Diagnostics.CodeAnalysis; @@ -8,7 +8,7 @@ using Kusto.Language.Editor; using Kusto.Language.Symbols; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public static class KustoCodeServiceExtensions { diff --git a/src/KustoLanguageServer/Utilities/KustoGenerator.cs b/src/Server/Utilities/KustoGenerator.cs similarity index 95% rename from src/KustoLanguageServer/Utilities/KustoGenerator.cs rename to src/Server/Utilities/KustoGenerator.cs index 165d7ae..203480b 100644 --- a/src/KustoLanguageServer/Utilities/KustoGenerator.cs +++ b/src/Server/Utilities/KustoGenerator.cs @@ -1,11 +1,11 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Data; using Kusto.Language; using Kusto.Language.Symbols; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public static class KustoGenerator { diff --git a/src/KustoLanguageServer/Utilities/KustoHtmlExtensions.cs b/src/Server/Utilities/KustoHtmlExtensions.cs similarity index 96% rename from src/KustoLanguageServer/Utilities/KustoHtmlExtensions.cs rename to src/Server/Utilities/KustoHtmlExtensions.cs index 16ea46e..f9666a6 100644 --- a/src/KustoLanguageServer/Utilities/KustoHtmlExtensions.cs +++ b/src/Server/Utilities/KustoHtmlExtensions.cs @@ -1,11 +1,11 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Cloud.Platform.Utils; using Kusto.Language.Editor; using System.Collections.Immutable; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public static class KustoHtmlExtensions { diff --git a/src/KustoLanguageServer/Utilities/LatestRequestQueue.cs b/src/Server/Utilities/LatestRequestQueue.cs similarity index 93% rename from src/KustoLanguageServer/Utilities/LatestRequestQueue.cs rename to src/Server/Utilities/LatestRequestQueue.cs index 702d34e..57e1a6e 100644 --- a/src/KustoLanguageServer/Utilities/LatestRequestQueue.cs +++ b/src/Server/Utilities/LatestRequestQueue.cs @@ -1,7 +1,7 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// A task queue that cancels the previous task when a new task is queued. diff --git a/src/KustoLanguageServer/Utilities/MarkdownBuilder.cs b/src/Server/Utilities/MarkdownBuilder.cs similarity index 92% rename from src/KustoLanguageServer/Utilities/MarkdownBuilder.cs rename to src/Server/Utilities/MarkdownBuilder.cs index 8e00b63..13a96e3 100644 --- a/src/KustoLanguageServer/Utilities/MarkdownBuilder.cs +++ b/src/Server/Utilities/MarkdownBuilder.cs @@ -1,9 +1,9 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Data; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public class MarkdownBuilder : TextBuilder { diff --git a/src/KustoLanguageServer/Utilities/ResultData.cs b/src/Server/Utilities/ResultData.cs similarity index 97% rename from src/KustoLanguageServer/Utilities/ResultData.cs rename to src/Server/Utilities/ResultData.cs index 83164db..327943e 100644 --- a/src/KustoLanguageServer/Utilities/ResultData.cs +++ b/src/Server/Utilities/ResultData.cs @@ -5,7 +5,7 @@ using System.Data; using System.Runtime.Serialization; -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// Serializable representation of a Kusto query execution result. diff --git a/src/KustoLanguageServer/Utilities/TaskQueue.cs b/src/Server/Utilities/TaskQueue.cs similarity index 94% rename from src/KustoLanguageServer/Utilities/TaskQueue.cs rename to src/Server/Utilities/TaskQueue.cs index 1bc5ada..8e87202 100644 --- a/src/KustoLanguageServer/Utilities/TaskQueue.cs +++ b/src/Server/Utilities/TaskQueue.cs @@ -1,7 +1,7 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Kusto.Lsp; +namespace Kusto.Vscode; /// /// Maintains a queue of tasks that run sequentially diff --git a/src/KustoLanguageServer/Utilities/TextBuilder.cs b/src/Server/Utilities/TextBuilder.cs similarity index 95% rename from src/KustoLanguageServer/Utilities/TextBuilder.cs rename to src/Server/Utilities/TextBuilder.cs index cb8dac3..c80b9bf 100644 --- a/src/KustoLanguageServer/Utilities/TextBuilder.cs +++ b/src/Server/Utilities/TextBuilder.cs @@ -1,9 +1,9 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Text; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public class TextBuilder { diff --git a/src/KustoLanguageServer/Utilities/TextExtensions.cs b/src/Server/Utilities/TextExtensions.cs similarity index 94% rename from src/KustoLanguageServer/Utilities/TextExtensions.cs rename to src/Server/Utilities/TextExtensions.cs index 8aeeb05..393d5ed 100644 --- a/src/KustoLanguageServer/Utilities/TextExtensions.cs +++ b/src/Server/Utilities/TextExtensions.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Runtime.CompilerServices; using Kusto.Language.Editor; -namespace Kusto.Lsp; +namespace Kusto.Vscode; public static class TextExtensions { diff --git a/src/KustoLanguageServer/Utilities/TypeExtensions.cs b/src/Server/Utilities/TypeExtensions.cs similarity index 77% rename from src/KustoLanguageServer/Utilities/TypeExtensions.cs rename to src/Server/Utilities/TypeExtensions.cs index f1492ea..bfdae3b 100644 --- a/src/KustoLanguageServer/Utilities/TypeExtensions.cs +++ b/src/Server/Utilities/TypeExtensions.cs @@ -1,7 +1,7 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Kusto.Lsp; +namespace Kusto.Vscode; public static class TypeExtensions { diff --git a/src/KustoLsp.Tests/Features/ConnectionManagerTests.cs b/src/ServerTests/Features/ConnectionManagerTests.cs similarity index 96% rename from src/KustoLsp.Tests/Features/ConnectionManagerTests.cs rename to src/ServerTests/Features/ConnectionManagerTests.cs index c98ae2d..a0a0d40 100644 --- a/src/KustoLsp.Tests/Features/ConnectionManagerTests.cs +++ b/src/ServerTests/Features/ConnectionManagerTests.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Kusto.Lsp; +using Kusto.Vscode; -namespace KustoLspTests; +namespace Tests.Features; [TestClass] public class ConnectionManagerTests diff --git a/src/KustoLsp.Tests/Features/DocumentManagerTests.cs b/src/ServerTests/Features/DocumentManagerTests.cs similarity index 99% rename from src/KustoLsp.Tests/Features/DocumentManagerTests.cs rename to src/ServerTests/Features/DocumentManagerTests.cs index 9d5eee3..83199c0 100644 --- a/src/KustoLsp.Tests/Features/DocumentManagerTests.cs +++ b/src/ServerTests/Features/DocumentManagerTests.cs @@ -1,12 +1,12 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Language; using Kusto.Language.Symbols; -using Kusto.Lsp; +using Kusto.Vscode; using System.Collections.Immutable; -namespace KustoLspTests; +namespace Tests.Features; [TestClass] public sealed class DocumentManagerTests diff --git a/src/KustoLsp.Tests/Features/OptionsManagerTests.cs b/src/ServerTests/Features/OptionsManagerTests.cs similarity index 99% rename from src/KustoLsp.Tests/Features/OptionsManagerTests.cs rename to src/ServerTests/Features/OptionsManagerTests.cs index a0124a3..ef7e104 100644 --- a/src/KustoLsp.Tests/Features/OptionsManagerTests.cs +++ b/src/ServerTests/Features/OptionsManagerTests.cs @@ -4,9 +4,9 @@ using System.Collections.Immutable; using Kusto.Language; using Kusto.Language.Editor; -using Kusto.Lsp; +using Kusto.Vscode; -namespace KustoLspTests; +namespace Tests.Features; [TestClass] public class OptionsManagerTests diff --git a/src/KustoLsp.Tests/Features/SchemaManagerTests.cs b/src/ServerTests/Features/SchemaManagerTests.cs similarity index 97% rename from src/KustoLsp.Tests/Features/SchemaManagerTests.cs rename to src/ServerTests/Features/SchemaManagerTests.cs index eb405cc..930e3ca 100644 --- a/src/KustoLsp.Tests/Features/SchemaManagerTests.cs +++ b/src/ServerTests/Features/SchemaManagerTests.cs @@ -2,9 +2,9 @@ // Licensed under the MIT license. using System.Collections.Immutable; -using Kusto.Lsp; +using Kusto.Vscode; -namespace KustoLspTests; +namespace Tests.Features; [TestClass] public class SchemaManagerTests diff --git a/src/KustoLsp.Tests/MSTestSettings.cs b/src/ServerTests/MSTestSettings.cs similarity index 100% rename from src/KustoLsp.Tests/MSTestSettings.cs rename to src/ServerTests/MSTestSettings.cs diff --git a/src/KustoLsp.Tests/KustoLspTests.csproj b/src/ServerTests/ServerTests.csproj similarity index 76% rename from src/KustoLsp.Tests/KustoLspTests.csproj rename to src/ServerTests/ServerTests.csproj index 10e38ed..2d6a724 100644 --- a/src/KustoLsp.Tests/KustoLspTests.csproj +++ b/src/ServerTests/ServerTests.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/src/KustoLsp.Tests/TestHelpers.cs b/src/ServerTests/TestHelpers.cs similarity index 96% rename from src/KustoLsp.Tests/TestHelpers.cs rename to src/ServerTests/TestHelpers.cs index 3208cfe..981c91e 100644 --- a/src/KustoLsp.Tests/TestHelpers.cs +++ b/src/ServerTests/TestHelpers.cs @@ -1,10 +1,10 @@ -namespace KustoLspTests; +namespace Tests; using Kusto.Language; using Kusto.Language.Editor; using Kusto.Language.Symbols; using Kusto.Language.Syntax; -using Kusto.Lsp; +using Kusto.Vscode; public static class TestHelpers { diff --git a/src/KustoLsp.Tests/Utilities/ClientDirectiveExtensionsTests.cs b/src/ServerTests/Utilities/ClientDirectiveExtensionsTests.cs similarity index 99% rename from src/KustoLsp.Tests/Utilities/ClientDirectiveExtensionsTests.cs rename to src/ServerTests/Utilities/ClientDirectiveExtensionsTests.cs index 4c1e10e..1554110 100644 --- a/src/KustoLsp.Tests/Utilities/ClientDirectiveExtensionsTests.cs +++ b/src/ServerTests/Utilities/ClientDirectiveExtensionsTests.cs @@ -1,11 +1,11 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Language.Editor; -using Kusto.Lsp; +using Kusto.Vscode; using System.Collections.Immutable; -namespace KustoLspTests; +namespace Tests.Utilities; [TestClass] public class ClientDirectiveExtensionsTests diff --git a/src/KustoLsp.Tests/Utilities/ConnectionFactsTests.cs b/src/ServerTests/Utilities/ConnectionFactsTests.cs similarity index 95% rename from src/KustoLsp.Tests/Utilities/ConnectionFactsTests.cs rename to src/ServerTests/Utilities/ConnectionFactsTests.cs index 909a83a..e141056 100644 --- a/src/KustoLsp.Tests/Utilities/ConnectionFactsTests.cs +++ b/src/ServerTests/Utilities/ConnectionFactsTests.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Kusto.Lsp; +using Kusto.Vscode; -namespace KustoLspTests; +namespace Tests.Utilities; [TestClass] public class ConnectionFactsTests diff --git a/src/KustoLsp.Tests/Utilities/DeclarationFinderTests.cs b/src/ServerTests/Utilities/DeclarationFinderTests.cs similarity index 96% rename from src/KustoLsp.Tests/Utilities/DeclarationFinderTests.cs rename to src/ServerTests/Utilities/DeclarationFinderTests.cs index 8f94607..4547e7b 100644 --- a/src/KustoLsp.Tests/Utilities/DeclarationFinderTests.cs +++ b/src/ServerTests/Utilities/DeclarationFinderTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using System.Collections.Immutable; @@ -7,9 +7,9 @@ using Kusto.Language.Editor; using Kusto.Language.Symbols; using Kusto.Language.Syntax; -using Kusto.Lsp; +using Kusto.Vscode; -namespace KustoLspTests; +namespace Tests.Utilities; using static TestHelpers; diff --git a/src/KustoLsp.Tests/Utilities/ErrorDecoderTests.cs b/src/ServerTests/Utilities/ErrorDecoderTests.cs similarity index 99% rename from src/KustoLsp.Tests/Utilities/ErrorDecoderTests.cs rename to src/ServerTests/Utilities/ErrorDecoderTests.cs index f55705e..5bb3c98 100644 --- a/src/KustoLsp.Tests/Utilities/ErrorDecoderTests.cs +++ b/src/ServerTests/Utilities/ErrorDecoderTests.cs @@ -1,12 +1,12 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. using Kusto.Data.Exceptions; -using Kusto.Lsp; +using Kusto.Vscode; using Kusto.Language; using Kusto.Language.Editor; -namespace KustoLspTests; +namespace Tests.Utilities; using static TestHelpers; diff --git a/src/KustoLsp.Tests/Utilities/KqlBuilderTests.cs b/src/ServerTests/Utilities/KqlBuilderTests.cs similarity index 96% rename from src/KustoLsp.Tests/Utilities/KqlBuilderTests.cs rename to src/ServerTests/Utilities/KqlBuilderTests.cs index c9d765c..c68277c 100644 --- a/src/KustoLsp.Tests/Utilities/KqlBuilderTests.cs +++ b/src/ServerTests/Utilities/KqlBuilderTests.cs @@ -1,14 +1,14 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Kusto.Lsp; +using Kusto.Vscode; using Kusto.Language.Editor; using Kusto.Language.Symbols; using System.Linq; using System.Collections.Generic; using System.Collections.Immutable; -namespace KustoLspTests; +namespace Tests.Utilities; [TestClass] public class KqlBuilderTests