-
Couldn't load subscription status.
- Fork 8
Grab release from github (#22) #28
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.
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
Open
cnoguera
wants to merge
2
commits into
emacs-lsp:master
Choose a base branch
from
cnoguera:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -29,6 +29,7 @@ | |||||||||||||
|
|
||||||||||||||
| (require 'lsp-mode) | ||||||||||||||
| (require 'lsp-treemacs) | ||||||||||||||
| (require 'lsp-treemacs-generic) | ||||||||||||||
| (require 'gnutls) | ||||||||||||||
|
|
||||||||||||||
| (defgroup lsp-mssql nil | ||||||||||||||
|
|
@@ -46,7 +47,7 @@ | |||||||||||||
| :type 'number) | ||||||||||||||
|
|
||||||||||||||
| (defconst lsp-mssql-server-download-url | ||||||||||||||
| "https://download.microsoft.com/download/c/2/f/c9857f58-e569-4677-ad24-f180e83a8252/microsoft.sqltools.servicelayer-%s") | ||||||||||||||
| "https://github.com/microsoft/sqltoolsservice/releases/download/5.0.20250910.2/Microsoft.SqlTools.ServiceLayer-%s") | ||||||||||||||
|
|
||||||||||||||
| (defconst lsp-mssql-executable-files | ||||||||||||||
| '("MicrosoftSqlToolsServiceLayer.exe" "MicrosoftSqlToolsServiceLayer" "MicrosoftSqlToolsServiceLayer.dll")) | ||||||||||||||
|
|
@@ -111,9 +112,9 @@ Will not do anything should the file exist already." | |||||||||||||
| "Download mssql server. | ||||||||||||||
| Uses `powershell' on windows and `tar' on Linux to extract the server binary." | ||||||||||||||
| (interactive) | ||||||||||||||
| (let* ((result (cond ((eq system-type 'darwin) "osx-x64-netcoreapp2.2.tar.gz") | ||||||||||||||
| ((eq system-type 'gnu/linux) "rhel-x64-netcoreapp2.2.tar.gz") | ||||||||||||||
| ((eq system-type 'windows-nt) "win-x64-netcoreapp2.2.zip") | ||||||||||||||
| (let* ((result (cond ((eq system-type 'darwin) "osx-arm64-net8.0.tar.gz") | ||||||||||||||
| ((eq system-type 'gnu/linux) "linux-x64-net8.0.tar.gz") | ||||||||||||||
| ((eq system-type 'windows-nt) "win-x64-net8.0.zip") | ||||||||||||||
| (t (error (format "Unsupported system: %s" system-type))))) | ||||||||||||||
| (download-location (f-join temporary-file-directory result)) | ||||||||||||||
| (url (format lsp-mssql-server-download-url result))) | ||||||||||||||
|
|
@@ -205,7 +206,7 @@ PARAMS Session created handler." | |||||||||||||
| (prog1 (save-excursion | ||||||||||||||
| (let ((inhibit-read-only t)) | ||||||||||||||
| ,@body)) | ||||||||||||||
| (org-show-all '(headings blocks))))) | ||||||||||||||
| (org-fold-show-all '(headings blocks))))) | ||||||||||||||
|
|
||||||||||||||
| (defun lsp-mssql--connection-complete (_workspace params) | ||||||||||||||
| "Connection completed handler. | ||||||||||||||
|
|
@@ -367,7 +368,7 @@ PARAMS the params." | |||||||||||||
| "Hanler for batch complete.") | ||||||||||||||
|
|
||||||||||||||
| (defun lsp-mssql--complete (_workspace _params) | ||||||||||||||
| "Hanler for complete." | ||||||||||||||
| "Handler for complete." | ||||||||||||||
| (lsp-mssql-with-result-buffer)) | ||||||||||||||
|
|
||||||||||||||
| (defvar-local lsp-mssql--markers (ht)) | ||||||||||||||
|
|
@@ -663,14 +664,19 @@ NODES - all nodes." | |||||||||||||
| "Show explorer. | ||||||||||||||
| TREE is the data to display, TITLE will be used for the | ||||||||||||||
| modeline in the result buffer." | ||||||||||||||
| (with-current-buffer (get-buffer-create "*SQL Object explorer*") | ||||||||||||||
| (lsp-treemacs-initialize) | ||||||||||||||
| (setq-local lsp-treemacs-tree tree) | ||||||||||||||
| (setq-local face-remapping-alist '((button . default))) | ||||||||||||||
| (lsp-treemacs-generic-refresh) | ||||||||||||||
| (display-buffer-in-side-window (current-buffer) '((side . right))) | ||||||||||||||
| (setq-local mode-name title) | ||||||||||||||
| (lsp-mssql-object-explorer-mode))) | ||||||||||||||
| (lsp-treemacs-render tree title 0 | ||||||||||||||
| "*SQL Object explorer*" nil) | ||||||||||||||
| (with-current-buffer "*SQL Object explorer*" | ||||||||||||||
| (display-buffer-in-side-window (current-buffer) '((side . right))) | ||||||||||||||
| (lsp-mssql-object-explorer-mode))) | ||||||||||||||
|
Comment on lines
+667
to
+671
|
||||||||||||||
|
|
||||||||||||||
| ;; - (with-current-buffer (get-buffer-create "*SQL Object explorer*") | ||||||||||||||
| ;; - (lsp-treemacs-initialize) | ||||||||||||||
| ;; - (setq-local lsp-treemacs-tree tree) | ||||||||||||||
| ;; - (setq-local face-remapping-alist '((button . default))) | ||||||||||||||
| ;; - (lsp-treemacs-generic-refresh);; - | ||||||||||||||
| ;; - (setq-local mode-name title) | ||||||||||||||
|
|
||||||||||||||
|
|
||||||||||||||
|
|
||||||||||||||
|
|
||||||||||||||
|
Comment on lines
+673
to
682
|
||||||||||||||
| ;; - (with-current-buffer (get-buffer-create "*SQL Object explorer*") | |
| ;; - (lsp-treemacs-initialize) | |
| ;; - (setq-local lsp-treemacs-tree tree) | |
| ;; - (setq-local face-remapping-alist '((button . default))) | |
| ;; - (lsp-treemacs-generic-refresh);; - | |
| ;; - (setq-local mode-name title) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The hardcoded ARM64 architecture for macOS may not work on Intel-based Macs. Consider detecting the actual architecture or providing both x64 and arm64 options for macOS.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems like a valid concern, but I have no way to verify the values of
system-configurationon a mac as I don't have one or anyone who could check. The variable does exist though and on my linux system it has value"x86_64-pc-linux-gnu"so it seems legit.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's pretty safe to do it this way. I have several packages that do this, and I have no issues with them.
Examples:
I'm running both packages on macOS M3.