Skip to content
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

Use ripgrep instead of vscode findFiles #910

Merged
merged 2 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: '20'
- run: npm ci
- run: npm ci --foreground-scripts
- run: npm run lint
if: ${{ matrix.os == 'ubuntu-latest' }}
- run: npm run build-web
Expand Down
17 changes: 15 additions & 2 deletions extension-browser.webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const path = require('path')
const CopyWebpackPlugin = require('copy-webpack-plugin')
const { ProvidePlugin } = require('webpack')
const { ProvidePlugin, NormalModuleReplacementPlugin } = require('webpack')

module.exports = {
entry: {
Expand Down Expand Up @@ -53,7 +53,7 @@ module.exports = {
externals: {
'vscode': 'commonjs vscode', // ignored because it doesn't exist,
'applicationinsights-native-metrics': 'commonjs applicationinsights-native-metrics', // ignored because we don't ship native module
'@opentelemetry/tracing': 'commonjs @opentelemetry/tracing' // ignored because we don't ship this module
'@opentelemetry/tracing': 'commonjs @opentelemetry/tracing', // ignored because we don't ship this module
},
performance: {
hints: false
Expand All @@ -69,6 +69,19 @@ module.exports = {
// yes, really source maps
devtool: 'nosources-source-map',
plugins: [
new NormalModuleReplacementPlugin(/antoraDocument$/, function (
resource
) {
// replaced because Antora cannot run in a web environment
resource.request = resource.request.replace(
/antoraDocument/,
`antoraDocumentBrowserShim`
);

if (resource.createData) {
resource.createData.request = resource.request;
}
}),
new CopyWebpackPlugin({
patterns: [
{
Expand Down
59 changes: 34 additions & 25 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@
"@fontsource/open-sans": "4.5.14",
"@fontsource/roboto-mono": "4.5.10",
"@highlightjs/cdn-assets": "~11.9.0",
"@playwright/test": "~1.44.0",
"@playwright/test": "^1.47.2",
"@types/lodash.throttle": "~4.1",
"@types/mocha": "~10.0",
"@types/node": "~20.14",
Expand Down Expand Up @@ -677,6 +677,7 @@
"@asciidoctor/core": "2.2.7",
"@asciidoctor/docbook-converter": "2.0.0",
"@orcid/bibtex-parse-js": "0.0.25",
"@vscode/ripgrep": "1.15.9",
"asciidoctor-kroki": "0.18.1",
"html-entities": "^2.4.0",
"js-yaml": "^4.1.0",
Expand Down
3 changes: 2 additions & 1 deletion src/asciidocEngine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { ExtensionContentSecurityPolicyArbiter } from './security'
import { AsciidocPreviewConfigurationManager } from './features/previewConfig'
import { SkinnyTextDocument } from './util/document'
import { AsciidocContributionProvider } from './asciidocExtensions'
import { AntoraSupportManager, getAntoraDocumentContext, getAntoraConfig } from './features/antora/antoraSupport'
import { getAntoraDocumentContext, getAntoraConfig } from './features/antora/antoraDocument'
import { AntoraSupportManager } from './features/antora/antoraContext'
import { WebviewResourceProvider } from './util/resources'
import { AsciidoctorConfigProvider } from './features/asciidoctorConfig'
import { AsciidocTextDocument } from './asciidocTextDocument'
Expand Down
2 changes: 1 addition & 1 deletion src/asciidocLoader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { SkinnyTextDocument } from './util/document'
import { AsciidoctorAttributesConfig } from './features/asciidoctorAttributesConfig'
import { AsciidoctorDiagnosticProvider } from './features/asciidoctorDiagnostic'
import { AsciidoctorIncludeItemsProvider, IncludeItems } from './features/asciidoctorIncludeItems'
import { getAntoraDocumentContext, getAntoraConfig } from './features/antora/antoraSupport'
import { getAntoraDocumentContext, getAntoraConfig } from './features/antora/antoraDocument'
import { IncludeProcessor } from './features/antora/includeProcessor'
import { resolveIncludeFile } from './features/antora/resolveIncludeFile'

Expand Down
2 changes: 1 addition & 1 deletion src/asciidoctorWebViewConverter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Asciidoctor } from '@asciidoctor/core'
import { SkinnyTextDocument } from './util/document'
import * as nls from 'vscode-nls'
import { AsciidocContributions } from './asciidocExtensions'
import { AntoraDocumentContext } from './features/antora/antoraSupport'
import { AntoraDocumentContext } from './features/antora/antoraContext'
import { getWorkspaceFolder } from './util/workspace'

const localize = nls.loadMessageBundle()
Expand Down
2 changes: 1 addition & 1 deletion src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { AsciidocTargetPathAutoCompletionMonitor } from './util/includeAutoCompl
import { AttributeReferenceProvider } from './features/attributeReferenceProvider'
import { BuiltinDocumentAttributeProvider } from './features/builtinDocumentAttributeProvider'
import AsciidocFoldingRangeProvider from './features/foldingProvider'
import { AntoraSupportManager } from './features/antora/antoraSupport'
import { AntoraSupportManager } from './features/antora/antoraContext'
import { DropImageIntoEditorProvider } from './features/dropIntoEditor'
import { AsciidoctorConfig } from './features/asciidoctorConfig'
import { AsciidoctorExtensions } from './features/asciidoctorExtensions'
Expand Down
2 changes: 1 addition & 1 deletion src/features/antora/antoraCompletionProvider.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as vscode from 'vscode'
import { getAttributes } from './antoraSupport'
import { getAttributes } from './antoraDocument'

export default class AntoraCompletionProvider {
async provideCompletionItems (textDocument: vscode.TextDocument, position: vscode.Position): Promise<vscode.CompletionItem[]> {
Expand Down
Loading