@master/css-language-server 2.0.0-rc.37 → 2.0.0-rc.38

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/core.cjs +8 -14
  2. package/dist/core.d.ts +0 -1
  3. package/dist/core.mjs +8 -14
  4. package/package.json +1 -1
package/dist/core.cjs CHANGED
@@ -3,13 +3,13 @@
3
3
  var node = require('vscode-languageserver/node');
4
4
  var vscodeLanguageserverTextdocument = require('vscode-languageserver-textdocument');
5
5
  var path = require('path');
6
- var url = require('url');
7
6
  var CSSLanguageService = require('@master/css-language-service');
8
7
  var exploreConfig = require('@master/css-explore-config');
9
8
  var extend = require('@techor/extend');
10
9
  var settings = require('./settings.cjs');
11
10
  var interceptLogs = require('./utils/intercept-logs.cjs');
12
11
  var glob = require('fast-glob');
12
+ var vscodeUri = require('vscode-uri');
13
13
 
14
14
  class CSSLanguageServer {
15
15
  customSettings;
@@ -118,7 +118,7 @@ class CSSLanguageServer {
118
118
  this.connection.listen();
119
119
  }
120
120
  async initWorkspaceFolder(workspaceFolderURI) {
121
- const workspaceFolderCWD = this.fileURLToPath(workspaceFolderURI);
121
+ const workspaceFolderCWD = vscodeUri.URI.parse(workspaceFolderURI).fsPath;
122
122
  const customWorkspaceFolderSettings = await this.connection.workspace.getConfiguration({
123
123
  scopeUri: workspaceFolderURI,
124
124
  section: 'masterCSS'
@@ -127,8 +127,7 @@ class CSSLanguageServer {
127
127
  const resolvedWorkspaceDirectories = new Set([
128
128
  workspaceFolderCWD
129
129
  ]);
130
- console.info('Registered workspace folder');
131
- console.log(workspaceFolderCWD);
130
+ console.info('Registered workspace folder', workspaceFolderURI);
132
131
  if (workspaces === 'auto') {
133
132
  (await glob('**/master.css.*', {
134
133
  cwd: workspaceFolderCWD,
@@ -149,11 +148,11 @@ class CSSLanguageServer {
149
148
  })).forEach((workspaceDir)=>resolvedWorkspaceDirectories.add(workspaceDir));
150
149
  }
151
150
  resolvedWorkspaceDirectories.forEach(async (workspaceDir)=>{
152
- console.info('Added workspace');
153
- console.log(workspaceDir);
151
+ const workspaceURI = vscodeUri.URI.file(workspaceDir).toString();
152
+ console.info('Added workspace', workspaceURI);
154
153
  this.workspaces.add({
155
154
  path: workspaceDir,
156
- uri: url.pathToFileURL(workspaceDir).href,
155
+ uri: workspaceURI,
157
156
  openedTextDocuments: new Set(),
158
157
  languageServiceSettings
159
158
  });
@@ -170,21 +169,16 @@ class CSSLanguageServer {
170
169
  console.info('Failed to load config from', workspace);
171
170
  console.error(e);
172
171
  }
173
- console.info('Initialized workspace', workspaceConfig ? '(with config file)' : '');
174
- console.log(workspace.path);
172
+ console.info('Initialized workspace', workspaceConfig ? '(with config file)' : '', workspace.uri);
175
173
  workspace.cssLanguageService = new CSSLanguageService({
176
174
  ...workspace.languageServiceSettings,
177
175
  config: workspaceConfig
178
176
  });
179
177
  }
180
178
  destroyCSSLanguageService(workspace) {
181
- console.info('Destroyed workspace');
182
- console.log(workspace.path);
179
+ console.info('Destroyed workspace', workspace.uri);
183
180
  delete workspace.cssLanguageService;
184
181
  }
185
- fileURLToPath(workspaceURI) {
186
- return url.fileURLToPath(workspaceURI.replace('%3A', ':'));
187
- }
188
182
  findClosestWorkspace(textDocumentURI) {
189
183
  let foundWorkspace;
190
184
  for (const workspace of this.workspaces){
package/dist/core.d.ts CHANGED
@@ -22,7 +22,6 @@ export default class CSSLanguageServer {
22
22
  private initWorkspaceFolder;
23
23
  initCSSLanguageService(workspace: Workspace): void;
24
24
  destroyCSSLanguageService(workspace: Workspace): void;
25
- fileURLToPath(workspaceURI: string): string;
26
25
  findClosestWorkspace(textDocumentURI: string): Workspace;
27
26
  stop(): void;
28
27
  }
package/dist/core.mjs CHANGED
@@ -1,13 +1,13 @@
1
1
  import { createConnection, TextDocuments, DidChangeConfigurationNotification } from 'vscode-languageserver/node';
2
2
  import { TextDocument } from 'vscode-languageserver-textdocument';
3
3
  import path from 'path';
4
- import { pathToFileURL, fileURLToPath } from 'url';
5
4
  import CSSLanguageService, { SERVER_CAPABILITIES } from '@master/css-language-service';
6
5
  import exploreConfig from '@master/css-explore-config';
7
6
  import extend from '@techor/extend';
8
7
  import settings from './settings.mjs';
9
8
  import interceptLogs from './utils/intercept-logs.mjs';
10
9
  import glob from 'fast-glob';
10
+ import { URI } from 'vscode-uri';
11
11
 
12
12
  class CSSLanguageServer {
13
13
  customSettings;
@@ -116,7 +116,7 @@ class CSSLanguageServer {
116
116
  this.connection.listen();
117
117
  }
118
118
  async initWorkspaceFolder(workspaceFolderURI) {
119
- const workspaceFolderCWD = this.fileURLToPath(workspaceFolderURI);
119
+ const workspaceFolderCWD = URI.parse(workspaceFolderURI).fsPath;
120
120
  const customWorkspaceFolderSettings = await this.connection.workspace.getConfiguration({
121
121
  scopeUri: workspaceFolderURI,
122
122
  section: 'masterCSS'
@@ -125,8 +125,7 @@ class CSSLanguageServer {
125
125
  const resolvedWorkspaceDirectories = new Set([
126
126
  workspaceFolderCWD
127
127
  ]);
128
- console.info('Registered workspace folder');
129
- console.log(workspaceFolderCWD);
128
+ console.info('Registered workspace folder', workspaceFolderURI);
130
129
  if (workspaces === 'auto') {
131
130
  (await glob('**/master.css.*', {
132
131
  cwd: workspaceFolderCWD,
@@ -147,11 +146,11 @@ class CSSLanguageServer {
147
146
  })).forEach((workspaceDir)=>resolvedWorkspaceDirectories.add(workspaceDir));
148
147
  }
149
148
  resolvedWorkspaceDirectories.forEach(async (workspaceDir)=>{
150
- console.info('Added workspace');
151
- console.log(workspaceDir);
149
+ const workspaceURI = URI.file(workspaceDir).toString();
150
+ console.info('Added workspace', workspaceURI);
152
151
  this.workspaces.add({
153
152
  path: workspaceDir,
154
- uri: pathToFileURL(workspaceDir).href,
153
+ uri: workspaceURI,
155
154
  openedTextDocuments: new Set(),
156
155
  languageServiceSettings
157
156
  });
@@ -168,21 +167,16 @@ class CSSLanguageServer {
168
167
  console.info('Failed to load config from', workspace);
169
168
  console.error(e);
170
169
  }
171
- console.info('Initialized workspace', workspaceConfig ? '(with config file)' : '');
172
- console.log(workspace.path);
170
+ console.info('Initialized workspace', workspaceConfig ? '(with config file)' : '', workspace.uri);
173
171
  workspace.cssLanguageService = new CSSLanguageService({
174
172
  ...workspace.languageServiceSettings,
175
173
  config: workspaceConfig
176
174
  });
177
175
  }
178
176
  destroyCSSLanguageService(workspace) {
179
- console.info('Destroyed workspace');
180
- console.log(workspace.path);
177
+ console.info('Destroyed workspace', workspace.uri);
181
178
  delete workspace.cssLanguageService;
182
179
  }
183
- fileURLToPath(workspaceURI) {
184
- return fileURLToPath(workspaceURI.replace('%3A', ':'));
185
- }
186
180
  findClosestWorkspace(textDocumentURI) {
187
181
  let foundWorkspace;
188
182
  for (const workspace of this.workspaces){
package/package.json CHANGED
@@ -1 +1 @@
1
- {"name":"@master/css-language-server","type":"module","scripts":{"build":"techor build \"src/**/*.ts\"","dev":"pnpm build --watch","type-check":"tsc --noEmit","lint":"eslint src","test":"jest"},"description":"Master CSS Language Server","author":"Aoyue Design LLC.","license":"MIT","repository":{"type":"git","url":"https://github.com/master-co/css.git","directory":"packages/language-server"},"dependencies":{"@master/css":"^2.0.0-rc.37","@master/css-explore-config":"^2.0.0-rc.37","@master/css-language-service":"^2.0.0-rc.37","@techor/extend":"^3.0.22","fast-glob":"^3.3.2","js-beautify":"^1.15.1","vscode-languageserver":"^9.0.1","vscode-languageserver-textdocument":"^1.0.11"},"devDependencies":{"@master/css-shared":"^2.0.0-rc.37"},"sideEffects":false,"main":"./dist/index.cjs","module":"./dist/index.mjs","jsnext:main":"./dist/index.mjs","esnext":"./dist/index.mjs","types":"./dist/index.d.ts","exports":{".":{"import":"./dist/index.mjs","require":"./dist/index.cjs","types":"./dist/index.d.ts"}},"files":["dist"],"publishConfig":{"access":"public","provenance":true},"version":"2.0.0-rc.37"}
1
+ {"name":"@master/css-language-server","type":"module","scripts":{"build":"techor build \"src/**/*.ts\"","dev":"pnpm build --watch","type-check":"tsc --noEmit","lint":"eslint src","test":"jest"},"description":"Master CSS Language Server","author":"Aoyue Design LLC.","license":"MIT","repository":{"type":"git","url":"https://github.com/master-co/css.git","directory":"packages/language-server"},"dependencies":{"@master/css":"^2.0.0-rc.38","@master/css-explore-config":"^2.0.0-rc.38","@master/css-language-service":"^2.0.0-rc.38","@techor/extend":"^3.0.22","fast-glob":"^3.3.2","js-beautify":"^1.15.1","vscode-languageserver":"^9.0.1","vscode-languageserver-textdocument":"^1.0.11","vscode-uri":"^3.0.8"},"devDependencies":{"@master/css-shared":"^2.0.0-rc.38"},"sideEffects":false,"main":"./dist/index.cjs","module":"./dist/index.mjs","jsnext:main":"./dist/index.mjs","esnext":"./dist/index.mjs","types":"./dist/index.d.ts","exports":{".":{"import":"./dist/index.mjs","require":"./dist/index.cjs","types":"./dist/index.d.ts"}},"files":["dist"],"publishConfig":{"access":"public","provenance":true},"version":"2.0.0-rc.38"}