-
Notifications
You must be signed in to change notification settings - Fork 18
Added features to the Makefile and Activation event #427
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
Closed
Closed
Changes from 1 commit
Commits
Show all changes
3 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 |
|---|---|---|
| @@ -1,9 +1,20 @@ | ||
| .DEFAULT_GOAL := package | ||
|
|
||
| .PHONY: package | ||
| package: | ||
| .PHONY: check-install compile package | ||
| package: compile | ||
| npm run package | ||
|
|
||
| .PHONY: install | ||
| install: | ||
| npm install | ||
|
|
||
| .PHONY: check-install | ||
| check-install: | ||
| @if [ ! -d "node_modules" ]; then \ | ||
| echo "installing npm packages..."; \ | ||
| npm install; \ | ||
| fi | ||
|
|
||
| .PHONY: compile | ||
| compile: check-install | ||
| npm run compile | ||
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 |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ import { startLanguageServer } from "./commands/start-lsp"; | |
| import { stopLanguageServer } from "./commands/stop-lsp"; | ||
| import { log } from "./log"; | ||
| import { activateStatusBar, deactivateStatusBar } from "./status-bar"; | ||
| import { bufState } from "./state"; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This import should be unused now ^^" Hmm, unfortunate that CI doesn't catch that... o_o |
||
|
|
||
| /** | ||
| * activate is the entrypoint for activating the extension. | ||
|
|
@@ -15,6 +16,20 @@ export async function activate(ctx: vscode.ExtensionContext) { | |
| ctx.subscriptions.push( | ||
| vscode.workspace.onDidChangeConfiguration(handleOnDidConfigChange) | ||
| ); | ||
|
|
||
| // Listen for when .proto files are opened | ||
| ctx.subscriptions.push( | ||
| vscode.workspace.onDidOpenTextDocument(handleProtoFileOpened) | ||
| ); | ||
|
|
||
| // Check if any .proto files are already open | ||
| for (const document of vscode.workspace.textDocuments) { | ||
| if (document.languageId === "proto") { | ||
| await handleProtoFileOpened(document); | ||
| break; // Only need to check once | ||
| } | ||
| } | ||
robconery marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| await installBuf.execute(); | ||
| } | ||
|
|
||
|
|
@@ -45,3 +60,22 @@ const handleOnDidConfigChange = async (e: vscode.ConfigurationChangeEvent) => { | |
| await startLanguageServer.execute(); | ||
| } | ||
| }; | ||
|
|
||
| /** | ||
| * handleProtoFileOpened checks when a .proto file is opened and ensures the language server is running. | ||
| */ | ||
| const handleProtoFileOpened = async (document: vscode.TextDocument) => { | ||
| if (document.languageId !== "proto") { | ||
| return; | ||
| } | ||
|
|
||
| const languageServerStatus = bufState.getLanguageServerStatus(); | ||
| if (languageServerStatus === "LANGUAGE_SERVER_RUNNING") { | ||
| // Language server is already running, nothing to do | ||
| return; | ||
| } | ||
|
|
||
| // Start the language server if it's not running | ||
| log.info("Proto file opened, ensuring language server is running..."); | ||
| await startLanguageServer.execute(); | ||
| }; | ||
doriable marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.